Sanity-check argument to indirect goto.

llvm-svn: 67746

2 files changed, 15 insertions, 3 deletions

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 4ef0fda3612..bbcc71d6e4d 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -687,10 +687,14 @@ Sema::ActOnGotoStmt(SourceLocation GotoLoc, SourceLocation LabelLoc,
 Action::OwningStmtResult
 Sema::ActOnIndirectGotoStmt(SourceLocation GotoLoc,SourceLocation StarLoc,
                             ExprArg DestExp) {
-  // FIXME: Verify that the operand is convertible to void*.
   // Convert operand to void*
-  Expr* E = (Expr*)DestExp.release();
-  ImpCastExprToType(E, Context.VoidPtrTy);
+  Expr* E = DestExp.takeAs<Expr>();
+  QualType ETy = E->getType();
+  AssignConvertType ConvTy =
+        CheckSingleAssignmentConstraints(Context.VoidPtrTy, E);
+  if (DiagnoseAssignmentResult(ConvTy, StarLoc, Context.VoidPtrTy, ETy,
+                               E, "passing"))
+    return StmtError();
   return Owned(new (Context) IndirectGotoStmt(E));
 }
 
diff --git a/clang/test/Sema/indirect-goto.c b/clang/test/Sema/indirect-goto.c
new file mode 100644
index 00000000000..35fb5e6315e
--- /dev/null
+++ b/clang/test/Sema/indirect-goto.c
@@ -0,0 +1,8 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+struct c {int x;};
+int a(struct c x, long long y) {
+  goto *x; // expected-error{{incompatible type}}
+  goto *y; // expected-warning{{incompatible integer to pointer conversion}}
+}
+