diff options
| -rw-r--r-- | lib/Sema/DeclSpec.cpp | 6 | ||||
| -rw-r--r-- | test/Parser/declarators.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/Sema/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp index 956775aa63..b46e8af9db 100644 --- a/lib/Sema/DeclSpec.cpp +++ b/lib/Sema/DeclSpec.cpp @@ -396,6 +396,7 @@ bool DeclSpec::SetTypeAltiVecPixel(bool isAltiVecPixel, SourceLocation Loc, bool DeclSpec::SetTypeSpecError() { TypeSpecType = TST_error; + TypeSpecOwned = false; TSTLoc = SourceLocation(); return false; } @@ -544,6 +545,7 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { TypeSpecType = TST_int; TypeSpecSign = TSS_unsigned; TypeSpecWidth = TSW_short; + TypeSpecOwned = false; } } @@ -573,6 +575,7 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { : diag::err_invalid_longlong_spec) << getSpecifierName((TST)TypeSpecType); TypeSpecType = TST_int; + TypeSpecOwned = false; } break; case TSW_long: // long double, long int @@ -582,6 +585,7 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { Diag(D, TSWLoc, SrcMgr, diag::err_invalid_long_spec) << getSpecifierName((TST)TypeSpecType); TypeSpecType = TST_int; + TypeSpecOwned = false; } break; } @@ -622,6 +626,8 @@ void DeclSpec::Finish(Diagnostic &D, Preprocessor &PP) { ClearStorageClassSpecs(); } + assert(!TypeSpecOwned || isDeclRep((TST) TypeSpecType)); + // Okay, now we can infer the real type. // TODO: return "auto function" and other bad things based on the real type. diff --git a/test/Parser/declarators.c b/test/Parser/declarators.c index fb69fa9c1d..ac960cd263 100644 --- a/test/Parser/declarators.c +++ b/test/Parser/declarators.c @@ -94,3 +94,6 @@ void test14() // expected-error {{expected ';' after top level declarator}} void test14a(); void *test14b = (void*)test14a; // Make sure test14a didn't get skipped. + +// rdar://problem/8358508 +long struct X {} test15(); // expected-error {{'long struct' is invalid}} |