aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/AsmParser/llvmAsmParser.cpp.cvs12
-rw-r--r--lib/AsmParser/llvmAsmParser.y12
-rw-r--r--lib/AsmParser/llvmAsmParser.y.cvs12
-rw-r--r--lib/Transforms/IPO/Inliner.cpp4
-rw-r--r--lib/VMCore/AsmWriter.cpp6
5 files changed, 23 insertions, 23 deletions
diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs
index 45a57998b7..80d1059085 100644
--- a/lib/AsmParser/llvmAsmParser.cpp.cvs
+++ b/lib/AsmParser/llvmAsmParser.cpp.cvs
@@ -4125,9 +4125,9 @@ yyreduce:
#line 1298 "/Volumes/Nanpura/fn_prop/llvm/lib/AsmParser/llvmAsmParser.y"
{
FunctionNotes tmp = (yyvsp[(1) - (3)].FunctionNotes) | (yyvsp[(3) - (3)].FunctionNotes);
- if ((yyvsp[(3) - (3)].FunctionNotes) == FP_NoInline && ((yyvsp[(1) - (3)].FunctionNotes) & FP_AlwaysInline))
+ if ((yyvsp[(3) - (3)].FunctionNotes) == FN_NOTE_NoInline && ((yyvsp[(1) - (3)].FunctionNotes) & FN_NOTE_AlwaysInline))
GEN_ERROR("Function Notes may include only one inline notes!")
- if ((yyvsp[(3) - (3)].FunctionNotes) == FP_AlwaysInline && ((yyvsp[(1) - (3)].FunctionNotes) & FP_NoInline))
+ if ((yyvsp[(3) - (3)].FunctionNotes) == FN_NOTE_AlwaysInline && ((yyvsp[(1) - (3)].FunctionNotes) & FN_NOTE_NoInline))
GEN_ERROR("Function Notes may include only one inline notes!")
(yyval.FunctionNotes) = tmp;
CHECK_FOR_ERROR
@@ -4136,22 +4136,22 @@ yyreduce:
case 130:
#line 1309 "/Volumes/Nanpura/fn_prop/llvm/lib/AsmParser/llvmAsmParser.y"
- { (yyval.FunctionNotes) = FP_NoInline; ;}
+ { (yyval.FunctionNotes) = FN_NOTE_NoInline; ;}
break;
case 131:
#line 1310 "/Volumes/Nanpura/fn_prop/llvm/lib/AsmParser/llvmAsmParser.y"
- { (yyval.FunctionNotes) = FP_AlwaysInline; ;}
+ { (yyval.FunctionNotes) = FN_NOTE_AlwaysInline; ;}
break;
case 132:
#line 1311 "/Volumes/Nanpura/fn_prop/llvm/lib/AsmParser/llvmAsmParser.y"
- { (yyval.FunctionNotes) = FP_OptimizeForSize; ;}
+ { (yyval.FunctionNotes) = FN_NOTE_OptimizeForSize; ;}
break;
case 133:
#line 1314 "/Volumes/Nanpura/fn_prop/llvm/lib/AsmParser/llvmAsmParser.y"
- { (yyval.FunctionNotes) = FP_None; ;}
+ { (yyval.FunctionNotes) = FN_NOTE_None; ;}
break;
case 134:
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index d004a4e399..5db76429b5 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -1297,21 +1297,21 @@ OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; }
FuncNoteList : FuncNote { $$ = $1; }
| FuncNoteList ',' FuncNote {
FunctionNotes tmp = $1 | $3;
- if ($3 == FP_NoInline && ($1 & FP_AlwaysInline))
+ if ($3 == FN_NOTE_NoInline && ($1 & FN_NOTE_AlwaysInline))
GEN_ERROR("Function Notes may include only one inline notes!")
- if ($3 == FP_AlwaysInline && ($1 & FP_NoInline))
+ if ($3 == FN_NOTE_AlwaysInline && ($1 & FN_NOTE_NoInline))
GEN_ERROR("Function Notes may include only one inline notes!")
$$ = tmp;
CHECK_FOR_ERROR
}
;
-FuncNote : INLINE '=' NEVER { $$ = FP_NoInline; }
- | INLINE '=' ALWAYS { $$ = FP_AlwaysInline; }
- | OPTIMIZEFORSIZE { $$ = FP_OptimizeForSize; }
+FuncNote : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
+ | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
+ | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
;
-OptFuncNotes : /* empty */ { $$ = FP_None; }
+OptFuncNotes : /* empty */ { $$ = FN_NOTE_None; }
| FNNOTE '(' FuncNoteList ')' {
$$ = $3;
}
diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs
index d004a4e399..5db76429b5 100644
--- a/lib/AsmParser/llvmAsmParser.y.cvs
+++ b/lib/AsmParser/llvmAsmParser.y.cvs
@@ -1297,21 +1297,21 @@ OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; }
FuncNoteList : FuncNote { $$ = $1; }
| FuncNoteList ',' FuncNote {
FunctionNotes tmp = $1 | $3;
- if ($3 == FP_NoInline && ($1 & FP_AlwaysInline))
+ if ($3 == FN_NOTE_NoInline && ($1 & FN_NOTE_AlwaysInline))
GEN_ERROR("Function Notes may include only one inline notes!")
- if ($3 == FP_AlwaysInline && ($1 & FP_NoInline))
+ if ($3 == FN_NOTE_AlwaysInline && ($1 & FN_NOTE_NoInline))
GEN_ERROR("Function Notes may include only one inline notes!")
$$ = tmp;
CHECK_FOR_ERROR
}
;
-FuncNote : INLINE '=' NEVER { $$ = FP_NoInline; }
- | INLINE '=' ALWAYS { $$ = FP_AlwaysInline; }
- | OPTIMIZEFORSIZE { $$ = FP_OptimizeForSize; }
+FuncNote : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; }
+ | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; }
+ | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; }
;
-OptFuncNotes : /* empty */ { $$ = FP_None; }
+OptFuncNotes : /* empty */ { $$ = FN_NOTE_None; }
| FNNOTE '(' FuncNoteList ')' {
$$ = $3;
}
diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp
index e9ae21f795..845ffd864e 100644
--- a/lib/Transforms/IPO/Inliner.cpp
+++ b/lib/Transforms/IPO/Inliner.cpp
@@ -142,9 +142,9 @@ bool Inliner::runOnSCC(const std::vector<CallGraphNode*> &SCC) {
Function *Fn = CS.getCalledFunction();
bool AlwaysInline = false;
- if (Fn && (Fn->getNotes() & FP_AlwaysInline))
+ if (Fn && (Fn->getNotes() & FN_NOTE_AlwaysInline))
AlwaysInline = true;
- if (Fn && (Fn->getNotes() & FP_NoInline))
+ if (Fn && (Fn->getNotes() & FN_NOTE_NoInline))
DOUT << "NOT Inlining: inline=never is set" << *CS.getInstruction();
else if (!AlwaysInline
&& InlineCost >= (int)(InlineThreshold * FudgeFactor)) {
diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp
index 724b34f460..b518b2c177 100644
--- a/lib/VMCore/AsmWriter.cpp
+++ b/lib/VMCore/AsmWriter.cpp
@@ -1396,11 +1396,11 @@ void AssemblyWriter::printFunction(const Function *F) {
if (F->hasGC())
Out << " gc \"" << F->getGC() << '"';
FunctionNotes FNotes = F->getNotes();
- if (FNotes != FP_None) {
+ if (FNotes != FN_NOTE_None) {
Out << " notes(";
- if (FNotes & FP_AlwaysInline)
+ if (FNotes & FN_NOTE_AlwaysInline)
Out << "inline=always";
- else if (FNotes & FP_NoInline)
+ else if (FNotes & FN_NOTE_NoInline)
Out << "inline=never";
Out << ")";
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-04 05:02:37 +0000