diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AsmParser/Lexer.l | 2 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 3 | ||||
| -rw-r--r-- | lib/VMCore/Function.cpp | 4 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 17 |
4 files changed, 22 insertions, 4 deletions
diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l index 0591cd99f3..98a21cabaa 100644 --- a/lib/AsmParser/Lexer.l +++ b/lib/AsmParser/Lexer.l @@ -275,6 +275,8 @@ noreturn { return NORETURN; } noalias { return NOALIAS; } byval { return BYVAL; } nest { return NEST; } +pure { return PURE; } +const { return CONST; } sext{WSNL} { // For auto-upgrade only, drop in LLVM 3.0 return SIGNEXT; } zext{WSNL} { // For auto-upgrade only, drop in LLVM 3.0 diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index f1c385f70e..4c9bed0daf 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1113,6 +1113,7 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { // Function Attributes %token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST +%token CONST PURE // Visibility Styles %token DEFAULT HIDDEN PROTECTED @@ -1256,6 +1257,8 @@ FuncAttr : NORETURN { $$ = ParamAttr::NoReturn; } | NOUNWIND { $$ = ParamAttr::NoUnwind; } | ZEROEXT { $$ = ParamAttr::ZExt; } | SIGNEXT { $$ = ParamAttr::SExt; } + | PURE { $$ = ParamAttr::Pure; } + | CONST { $$ = ParamAttr::Const; } ; OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; } diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 3582b32150..3256d5b9f6 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -108,6 +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 "; return Result; } diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index dea94088fa..09a7adce75 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -398,7 +398,8 @@ void Verifier::visitFunction(Function &F) { ParamAttr::Nest | ParamAttr::StructRet; const uint16_t ParameterIncompatible = - ParamAttr::NoReturn | ParamAttr::NoUnwind; + ParamAttr::NoReturn | ParamAttr::NoUnwind | + ParamAttr::Const | ParamAttr::Pure; const uint16_t MutuallyIncompatible = ParamAttr::ByVal | ParamAttr::InReg | @@ -407,6 +408,9 @@ void Verifier::visitFunction(Function &F) { const uint16_t MutuallyIncompatible2 = ParamAttr::ZExt | ParamAttr::SExt; + const uint16_t MutuallyIncompatible3 = + ParamAttr::Pure | ParamAttr::Const; + const uint16_t IntegerTypeOnly = ParamAttr::SExt | ParamAttr::ZExt; @@ -423,9 +427,14 @@ void Verifier::visitFunction(Function &F) { uint16_t RetI = Attrs->getParamAttrs(0) & ReturnIncompatible; Assert1(!RetI, "Attribute " + Attrs->getParamAttrsText(RetI) + "should not apply to functions!", &F); - uint16_t MutI = Attrs->getParamAttrs(0) & MutuallyIncompatible2; - Assert1(MutI != MutuallyIncompatible2, "Attributes" + - Attrs->getParamAttrsText(MutI) + "are incompatible!", &F); + + uint16_t MutI2 = Attrs->getParamAttrs(0) & MutuallyIncompatible2; + Assert1(MutI2 != MutuallyIncompatible2, "Attributes" + + Attrs->getParamAttrsText(MutI2) + "are incompatible!", &F); + + uint16_t MutI3 = Attrs->getParamAttrs(0) & MutuallyIncompatible3; + Assert1(MutI3 != MutuallyIncompatible3, "Attributes" + + Attrs->getParamAttrsText(MutI3) + "are incompatible!", &F); for (FunctionType::param_iterator I = FT->param_begin(), E = FT->param_end(); I != E; ++I, ++Idx) { |