commit 3cd7fc3d4d63d89391a0f09978c315b86538f0a8
author Steve Naroff <snaroff@apple.com> Tue Feb 12 04:08:59 2008 +0000
committer Steve Naroff <snaroff@apple.com> Tue Feb 12 04:08:59 2008 +0000
tree d4ba3deb76aa857fa7f84f9f7b056e532d181a3f
parent 4a71244cb083577c7dc8d06faa74c28dea8783cd

Allow the parser to detect invalid DeclSpec's. This fixes http://llvm.org/bugs/show_bug.cgi?id=1987.

This commit only "guards" the call to ParseDeclarationSpecifiers() in ParseDeclarationOrFunctionDefinition(). 

We could consider guarding all calls, however this is a bit radical (since it effectively stops parsing the declaration once we have a bad declspec). Will discuss with Chris tomorrow.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46984 91177308-0d34-0410-b5e6-96231b3b80d8

Parse/DeclSpec.cpp

diff --git a/Parse/DeclSpec.cpp b/Parse/DeclSpec.cpp
index 15e291f..8f9a5fd 100644
--- a/Parse/DeclSpec.cpp
+++ b/Parse/DeclSpec.cpp
@@ -47,36 +47,40 @@
   }
 }
 
-static bool BadSpecifier(DeclSpec::SCS S, const char *&PrevSpec) {
-  PrevSpec = DeclSpec::getSpecifierName(S);
+bool DeclSpec::BadSpecifier(SCS S, const char *&PrevSpec) {
+  Invalid = true;
+  PrevSpec = getSpecifierName(S);
   return true;
 }
 
-static bool BadSpecifier(DeclSpec::TSW W, const char *&PrevSpec) {
+bool DeclSpec::BadSpecifier(TSW W, const char *&PrevSpec) {
+  Invalid = true;
   switch (W) {
-  case DeclSpec::TSW_unspecified: PrevSpec = "unspecified"; break;
-  case DeclSpec::TSW_short:       PrevSpec = "short"; break;
-  case DeclSpec::TSW_long:        PrevSpec = "long"; break;
-  case DeclSpec::TSW_longlong:    PrevSpec = "long long"; break;
+  case TSW_unspecified: PrevSpec = "unspecified"; break;
+  case TSW_short:       PrevSpec = "short"; break;
+  case TSW_long:        PrevSpec = "long"; break;
+  case TSW_longlong:    PrevSpec = "long long"; break;
   }
   return true;
 }
 
-static bool BadSpecifier(DeclSpec::TSC C, const char *&PrevSpec) {
+bool DeclSpec::BadSpecifier(TSC C, const char *&PrevSpec) {
+  Invalid = true;
   switch (C) {
-  case DeclSpec::TSC_unspecified: PrevSpec = "unspecified"; break;
-  case DeclSpec::TSC_imaginary:   PrevSpec = "imaginary"; break;
-  case DeclSpec::TSC_complex:     PrevSpec = "complex"; break;
+  case TSC_unspecified: PrevSpec = "unspecified"; break;
+  case TSC_imaginary:   PrevSpec = "imaginary"; break;
+  case TSC_complex:     PrevSpec = "complex"; break;
   }
   return true;
 }
 
 
-static bool BadSpecifier(DeclSpec::TSS S, const char *&PrevSpec) {
+bool DeclSpec::BadSpecifier(TSS S, const char *&PrevSpec) {
+  Invalid = true;
   switch (S) {
-  case DeclSpec::TSS_unspecified: PrevSpec = "unspecified"; break;
-  case DeclSpec::TSS_signed:      PrevSpec = "signed"; break;
-  case DeclSpec::TSS_unsigned:    PrevSpec = "unsigned"; break;
+  case TSS_unspecified: PrevSpec = "unspecified"; break;
+  case TSS_signed:      PrevSpec = "signed"; break;
+  case TSS_unsigned:    PrevSpec = "unsigned"; break;
   }
   return true;
 }
@@ -103,12 +107,14 @@
   }
 }
 
-static bool BadSpecifier(DeclSpec::TST T, const char *&PrevSpec) {
-  PrevSpec = DeclSpec::getSpecifierName(T);
+bool DeclSpec::BadSpecifier(TST T, const char *&PrevSpec) {
+  Invalid = true;
+  PrevSpec = getSpecifierName(T);
   return true;
 }
 
-static bool BadSpecifier(DeclSpec::TQ T, const char *&PrevSpec) {
+bool DeclSpec::BadSpecifier(TQ T, const char *&PrevSpec) {
+  Invalid = true;
   switch (T) {
   case DeclSpec::TQ_unspecified: PrevSpec = "unspecified"; break;
   case DeclSpec::TQ_const:       PrevSpec = "const"; break;