diff options
| author | Logan Chien <loganchien@google.com> | 2011-12-16 09:08:45 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-12-16 13:28:58 +0800 |
| commit | a1e6e241a813f81be2d2f36ab60c950ca297574b (patch) | |
| tree | cf2d7ec5c63f40e2b66d8be7737496719a0d7902 /lib/TableGen | |
| parent | ac212abcc6d858470ad35ce7d660af0c1800364a (diff) | |
| parent | ddecfe54a35ffbe0675f7f33e493734fd60b2495 (diff) | |
| download | external_llvm-a1e6e241a813f81be2d2f36ab60c950ca297574b.zip external_llvm-a1e6e241a813f81be2d2f36ab60c950ca297574b.tar.gz external_llvm-a1e6e241a813f81be2d2f36ab60c950ca297574b.tar.bz2 | |
Merge with LLVM upstream r146714 (Dec 16th 2011)
Change-Id: Ied458adb08bf9a69250cbcee9b14b44d17e8701a
Diffstat (limited to 'lib/TableGen')
| -rw-r--r-- | lib/TableGen/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/TableGen/LLVMBuild.txt | 1 | ||||
| -rw-r--r-- | lib/TableGen/TGParser.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/lib/TableGen/CMakeLists.txt b/lib/TableGen/CMakeLists.txt index 0db4134..e678087 100644 --- a/lib/TableGen/CMakeLists.txt +++ b/lib/TableGen/CMakeLists.txt @@ -10,7 +10,3 @@ add_llvm_library(LLVMTableGen TGLexer.cpp TGParser.cpp ) - -add_llvm_library_dependencies(LLVMTableGen - LLVMSupport - ) diff --git a/lib/TableGen/LLVMBuild.txt b/lib/TableGen/LLVMBuild.txt index 4e24c37..54cedfd 100644 --- a/lib/TableGen/LLVMBuild.txt +++ b/lib/TableGen/LLVMBuild.txt @@ -20,4 +20,3 @@ type = Library name = TableGen parent = Libraries required_libraries = Support - diff --git a/lib/TableGen/TGParser.cpp b/lib/TableGen/TGParser.cpp index c06add4..8bcb029 100644 --- a/lib/TableGen/TGParser.cpp +++ b/lib/TableGen/TGParser.cpp @@ -2219,6 +2219,8 @@ bool TGParser::ParseDefm(MultiClass *CurMultiClass) { Record *DefProto = MC->DefPrototypes[i]; Record *CurRec = InstantiateMulticlassDef(*MC, DefProto, DefmPrefix, DefmPrefixLoc); + if (!CurRec) + return true; if (ResolveMulticlassDefArgs(*MC, CurRec, DefmPrefixLoc, SubClassLoc, TArgs, TemplateVals, true/*Delete args*/)) |