diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 4 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 6 | ||||
| -rw-r--r-- | lib/VMCore/Function.cpp | 8 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index 27798be618..5b1f0740dc 100644 --- a/lib/AsmParser/LLLexer.cpp +++ b/lib/AsmParser/LLLexer.cpp @@ -484,8 +484,8 @@ int LLLexer::LexIdentifier() { KEYWORD("noalias", NOALIAS); KEYWORD("byval", BYVAL); KEYWORD("nest", NEST); - KEYWORD("pure", PURE); - KEYWORD("const", CONST); + KEYWORD("readnone", READNONE); + KEYWORD("readonly", READONLY); KEYWORD("type", TYPE); KEYWORD("opaque", OPAQUE); diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index 599300d30f..a1373ce18d 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1090,7 +1090,7 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) { // Function Attributes %token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST -%token CONST PURE +%token READNONE READONLY // Visibility Styles %token DEFAULT HIDDEN PROTECTED @@ -1234,8 +1234,8 @@ FuncAttr : NORETURN { $$ = ParamAttr::NoReturn; } | NOUNWIND { $$ = ParamAttr::NoUnwind; } | ZEROEXT { $$ = ParamAttr::ZExt; } | SIGNEXT { $$ = ParamAttr::SExt; } - | PURE { $$ = ParamAttr::Pure; } - | CONST { $$ = ParamAttr::Const; } + | READNONE { $$ = ParamAttr::ReadNone; } + | READONLY { $$ = ParamAttr::ReadOnly; } ; OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; } diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index a011aaea33..6c29371862 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -108,10 +108,10 @@ ParamAttrsList::getParamAttrsText(uint16_t Attrs) { Result += "byval "; if (Attrs & ParamAttr::Nest) Result += "nest "; - if (Attrs & ParamAttr::Pure) - Result += "pure "; - if (Attrs & ParamAttr::Const) - Result += "const "; + if (Attrs & ParamAttr::ReadNone) + Result += "readnone "; + if (Attrs & ParamAttr::ReadOnly) + Result += "readonly "; return Result; } diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 6597af101c..1f726afa5d 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -399,7 +399,7 @@ void Verifier::visitFunction(Function &F) { const uint16_t ParameterIncompatible = ParamAttr::NoReturn | ParamAttr::NoUnwind | - ParamAttr::Const | ParamAttr::Pure; + ParamAttr::ReadNone | ParamAttr::ReadOnly; const uint16_t MutuallyIncompatible[3] = { ParamAttr::ByVal | ParamAttr::InReg | @@ -407,7 +407,7 @@ void Verifier::visitFunction(Function &F) { ParamAttr::ZExt | ParamAttr::SExt, - ParamAttr::Pure | ParamAttr::Const + ParamAttr::ReadNone | ParamAttr::ReadOnly }; const uint16_t IntegerTypeOnly = |