diff options
| author | Shuxin Yang <shuxin.llvm@gmail.com> | 2013-10-27 03:08:44 +0000 |
|---|---|---|
| committer | Shuxin Yang <shuxin.llvm@gmail.com> | 2013-10-27 03:08:44 +0000 |
| commit | 69bd41dfe33f24414be281ba5e2204b7348c33ae (patch) | |
| tree | d27a491b8bbcfd934d23ff82ddaa8323f8dc590d /lib/AsmParser | |
| parent | 2d60c0945102e6887fcdc752a7b714546afae354 (diff) | |
| download | external_llvm-69bd41dfe33f24414be281ba5e2204b7348c33ae.zip external_llvm-69bd41dfe33f24414be281ba5e2204b7348c33ae.tar.gz external_llvm-69bd41dfe33f24414be281ba5e2204b7348c33ae.tar.bz2 | |
Revert r193251 : Use address-taken to disambiguate global variable and indirect memops.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193489 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser')
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 1 | ||||
| -rw-r--r-- | lib/AsmParser/LLParser.cpp | 4 | ||||
| -rw-r--r-- | lib/AsmParser/LLToken.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index 6d643b6..99bff45 100644 --- a/lib/AsmParser/LLLexer.cpp +++ b/lib/AsmParser/LLLexer.cpp @@ -504,7 +504,6 @@ lltok::Kind LLLexer::LexIdentifier() { KEYWORD(zeroinitializer); KEYWORD(undef); KEYWORD(null); - KEYWORD(notaddrtaken); KEYWORD(to); KEYWORD(tail); KEYWORD(target); diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 9b5fb27..74c0ea4 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -704,7 +704,7 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc, unsigned Linkage, bool HasLinkage, unsigned Visibility) { unsigned AddrSpace; - bool IsConstant, UnnamedAddr, IsExternallyInitialized, notAddrTaken; + bool IsConstant, UnnamedAddr, IsExternallyInitialized; GlobalVariable::ThreadLocalMode TLM; LocTy UnnamedAddrLoc; LocTy IsExternallyInitializedLoc; @@ -719,7 +719,6 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc, IsExternallyInitialized, &IsExternallyInitializedLoc) || ParseGlobalType(IsConstant) || - ParseOptionalToken(lltok::kw_notaddrtaken, notAddrTaken) || ParseType(Ty, TyLoc)) return true; @@ -777,7 +776,6 @@ bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc, GV->setLinkage((GlobalValue::LinkageTypes)Linkage); GV->setVisibility((GlobalValue::VisibilityTypes)Visibility); GV->setExternallyInitialized(IsExternallyInitialized); - GV->setAddressMaybeTaken(!notAddrTaken); GV->setThreadLocalMode(TLM); GV->setUnnamedAddr(UnnamedAddr); diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h index 7832e81..e1382fd 100644 --- a/lib/AsmParser/LLToken.h +++ b/lib/AsmParser/LLToken.h @@ -51,7 +51,6 @@ namespace lltok { kw_localdynamic, kw_initialexec, kw_localexec, kw_zeroinitializer, kw_undef, kw_null, - kw_notaddrtaken, kw_to, kw_tail, kw_target, |