Index: lib/Transforms/Scalar/NewGVN.cpp
===================================================================
--- lib/Transforms/Scalar/NewGVN.cpp
+++ lib/Transforms/Scalar/NewGVN.cpp
@@ -1166,9 +1166,9 @@
         SimplifyBinOp(E->getOpcode(), E->getOperand(0), E->getOperand(1), SQ);
     if (const Expression *SimplifiedE = checkSimplificationResults(E, I, V))
       return SimplifiedE;
-  } else if (auto *BI = dyn_cast<BitCastInst>(I)) {
+  } else if (auto *CI = dyn_cast<CastInst>(I)) {
     Value *V =
-        SimplifyCastInst(BI->getOpcode(), BI->getOperand(0), BI->getType(), SQ);
+        SimplifyCastInst(CI->getOpcode(), E->getOperand(0), CI->getType(), SQ);
     if (const Expression *SimplifiedE = checkSimplificationResults(E, I, V))
       return SimplifiedE;
   } else if (isa<GetElementPtrInst>(I)) {
@@ -1984,6 +1984,7 @@
       E = performSymbolicLoadEvaluation(I);
       break;
     case Instruction::BitCast:
+    case Instruction::AddrSpaceCast:
       E = createExpression(I);
       break;
     case Instruction::ICmp:
Index: test/Transforms/NewGVN/addrspacecast.ll
===================================================================
--- /dev/null
+++ test/Transforms/NewGVN/addrspacecast.ll
@@ -0,0 +1,64 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt < %s -newgvn -S | FileCheck %s
+
+define i32 addrspace(1)* @addrspacecast(i32* %ptr) {
+; CHECK-LABEL: @addrspacecast(
+; CHECK-NEXT:  block1:
+; CHECK-NEXT:    [[Z1:%.*]] = addrspacecast i32* [[PTR:%.*]] to i32 addrspace(1)*
+; CHECK-NEXT:    br label [[BLOCK2:%.*]]
+; CHECK:       block2:
+; CHECK-NEXT:    store i32 addrspace(1)* [[Z1]], i32 addrspace(1)** undef
+; CHECK-NEXT:    ret i32 addrspace(1)* [[Z1]]
+;
+block1:
+  %z1 = addrspacecast i32* %ptr to i32 addrspace(1)*
+  br label %block2
+
+block2:
+  %z2 = addrspacecast i32* %ptr to i32 addrspace(1)*
+  store i32 addrspace(1)* %z1, i32 addrspace(1)** undef
+  ret i32 addrspace(1)* %z2
+}
+
+define i32 addrspace(1)* @addrspacecast_simplify(i32 addrspace(1)* %ptr) {
+; CHECK-LABEL: @addrspacecast_simplify(
+; CHECK-NEXT:  block1:
+; CHECK-NEXT:    [[CAST0:%.*]] = addrspacecast i32 addrspace(1)* [[PTR:%.*]] to i32*
+; CHECK-NEXT:    br label [[BLOCK2:%.*]]
+; CHECK:       block2:
+; CHECK-NEXT:    store i32 addrspace(1)* [[PTR]], i32 addrspace(1)** undef
+; CHECK-NEXT:    ret i32 addrspace(1)* [[PTR]]
+;
+block1:
+  %cast0 = addrspacecast i32 addrspace(1)* %ptr to i32*
+  %z1 = addrspacecast i32* %cast0 to i32 addrspace(1)*
+  br label %block2
+
+block2:
+  %z2 = addrspacecast i32* %cast0 to i32 addrspace(1)*
+  store i32 addrspace(1)* %z1, i32 addrspace(1)** undef
+  ret i32 addrspace(1)* %z2
+}
+
+@h = common local_unnamed_addr global i32* null, align 4
+
+define i32 addrspace(1)* @addrspacecast_constant() {
+; CHECK-LABEL: @addrspacecast_constant(
+; CHECK-NEXT:  block1:
+; CHECK-NEXT:    store i32* undef, i32** @h, align 4
+; CHECK-NEXT:    br label [[BLOCK2:%.*]]
+; CHECK:       block2:
+; CHECK-NEXT:    store i32 addrspace(1)* undef, i32 addrspace(1)** undef
+; CHECK-NEXT:    ret i32 addrspace(1)* undef
+;
+block1:
+  store i32* undef, i32** @h, align 4
+  %ptr = load i32*, i32** @h, align 4
+  %z1 = addrspacecast i32 * %ptr to i32 addrspace(1)*
+  br label %block2
+
+block2:
+  %z2 = addrspacecast i32* %ptr to i32 addrspace(1)*
+  store i32 addrspace(1)* %z1, i32 addrspace(1)** undef
+  ret i32 addrspace(1)* %z2
+}