diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index abdf5ecc88d..6b9792aa77b 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -531,6 +531,7 @@ uint32_t GVN::ValueTable::lookupOrAdd(Value *V) {
     case Instruction::AddrSpaceCast:
     case Instruction::BitCast:
     case Instruction::Select:
+    case Instruction::Freeze:
     case Instruction::ExtractElement:
     case Instruction::InsertElement:
     case Instruction::ShuffleVector:
diff --git a/test/Transforms/GVN/freeze.ll b/test/Transforms/GVN/freeze.ll
new file mode 100644
index 00000000000..1a6d84b5f13
--- /dev/null
+++ b/test/Transforms/GVN/freeze.ll
@@ -0,0 +1,56 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt < %s -gvn -S | FileCheck %s
+; RUN: opt < %s -passes=gvn -S | FileCheck %s
+
+define i1 @f(i1 %a) {
+; CHECK-LABEL: @f(
+; CHECK-NEXT:    [[B:%.*]] = freeze i1 [[A:%.*]]
+; CHECK-NEXT:    ret i1 [[B]]
+;
+  %b = freeze i1 %a
+  %c = freeze i1 %a
+  %d = and i1 %b, %b
+  ret i1 %d
+}
+
+define void @f_multipleuses(i1 %a) {
+; CHECK-LABEL: @f_multipleuses(
+; CHECK-NEXT:    [[B:%.*]] = freeze i1 [[A:%.*]]
+; CHECK-NEXT:    call void @use1(i1 [[B]])
+; CHECK-NEXT:    call void @use1(i1 [[B]])
+; CHECK-NEXT:    call void @use1(i1 [[B]])
+; CHECK-NEXT:    ret void
+;
+  %b = freeze i1 %a
+  %c = freeze i1 %a
+  call void @use1(i1 %b)
+  call void @use1(i1 %c)
+  call void @use1(i1 %c)
+  ret void
+}
+
+define void @f_dom(i1 %cond, i1 %a) {
+; CHECK-LABEL: @f_dom(
+; CHECK-NEXT:    br i1 [[COND:%.*]], label [[BB1:%.*]], label [[BB2:%.*]]
+; CHECK:       BB1:
+; CHECK-NEXT:    [[X:%.*]] = freeze i1 [[A:%.*]]
+; CHECK-NEXT:    call void @use1(i1 [[X]])
+; CHECK-NEXT:    ret void
+; CHECK:       BB2:
+; CHECK-NEXT:    [[Y:%.*]] = freeze i1 [[A]]
+; CHECK-NEXT:    call void @use2(i1 [[Y]])
+; CHECK-NEXT:    ret void
+;
+  br i1 %cond, label %BB1, label %BB2
+BB1:
+  %x = freeze i1 %a
+  call void @use1(i1 %x)
+  ret void
+BB2:
+  %y = freeze i1 %a
+  call void @use2(i1 %y) ; cannot use %x
+  ret void
+}
+declare void @use1(i1)
+declare void @use2(i1)
+