diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 7fefcf2764d5c9ca8fbd279a263569ab9a3ad831..a75003bf3f5d34e2cddceeaadec96a0f53687dd8 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -906,10 +906,10 @@ Sema::ActOnIndirectGotoStmt(SourceLocation GotoLoc, SourceLocation StarLoc,
   Expr* E = DestExp.takeAs<Expr>();
   if (!E->isTypeDependent()) {
     QualType ETy = E->getType();
+    QualType DestTy = Context.getPointerType(Context.VoidTy.withConst());
     AssignConvertType ConvTy =
-      CheckSingleAssignmentConstraints(Context.VoidPtrTy, E);
-    if (DiagnoseAssignmentResult(ConvTy, StarLoc, Context.VoidPtrTy, ETy,
-                                 E, AA_Passing))
+      CheckSingleAssignmentConstraints(DestTy, E);
+    if (DiagnoseAssignmentResult(ConvTy, StarLoc, DestTy, ETy, E, AA_Passing))
       return StmtError();
   }
   return Owned(new (Context) IndirectGotoStmt(GotoLoc, StarLoc, E));
diff --git a/clang/test/Sema/indirect-goto.c b/clang/test/Sema/indirect-goto.c
index 134ccd8a707600a7d2da32b8e081b591ff23fe79..4c1c6c328a18ff74eb5f501a4378d942615b09ff 100644
--- a/clang/test/Sema/indirect-goto.c
+++ b/clang/test/Sema/indirect-goto.c
@@ -2,6 +2,9 @@
 
 struct c {int x;};
 int a(struct c x, long long y) {
+  void const* l1_ptr = &&l1;
+  goto *l1_ptr;
+l1:
   goto *x; // expected-error{{incompatible type}}
   goto *y; // expected-warning{{incompatible integer to pointer conversion}}
 }