diff options
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 6 | ||||
| -rw-r--r-- | test/Sema/indirect-goto.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 7fefcf2764..a75003bf3f 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/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/test/Sema/indirect-goto.c b/test/Sema/indirect-goto.c index 134ccd8a70..4c1c6c328a 100644 --- a/test/Sema/indirect-goto.c +++ b/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}} } |