diff options
| -rw-r--r-- | include/llvm/CompilerDriver/Common.td | 11 | ||||
| -rw-r--r-- | utils/TableGen/LLVMCConfigurationEmitter.cpp | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/llvm/CompilerDriver/Common.td b/include/llvm/CompilerDriver/Common.td index 2ea1f4a..e1a0213 100644 --- a/include/llvm/CompilerDriver/Common.td +++ b/include/llvm/CompilerDriver/Common.td @@ -46,9 +46,6 @@ def really_hidden; def required; def zero_or_one; -// Empty DAG marker. -def empty; - // The 'case' construct. def case; @@ -66,6 +63,7 @@ def switch_on; def parameter_equals; def element_in_list; def input_languages_contain; +def empty; def not_empty; def default; @@ -82,6 +80,9 @@ def error; def inc_weight; def dec_weight; +// Empty DAG marker. +def empty_dag_marker; + // Used to specify plugin priority. class PluginPriority<int p> { int priority = p; @@ -111,10 +112,10 @@ class EdgeBase<string t1, string t2, dag d> { dag weight = d; } -class Edge<string t1, string t2> : EdgeBase<t1, t2, (empty)>; +class Edge<string t1, string t2> : EdgeBase<t1, t2, (empty_dag_marker)>; // Edge and SimpleEdge are synonyms. -class SimpleEdge<string t1, string t2> : EdgeBase<t1, t2, (empty)>; +class SimpleEdge<string t1, string t2> : EdgeBase<t1, t2, (empty_dag_marker)>; // Optionally enabled edge. class OptionalEdge<string t1, string t2, dag props> : EdgeBase<t1, t2, props>; diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp index 8a5b36a..0807bff 100644 --- a/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -89,7 +89,7 @@ void checkNumberOfArguments (const DagInit* d, unsigned min_arguments) { // isDagEmpty - is this DAG marked with an empty marker? bool isDagEmpty (const DagInit* d) { - return d->getOperator()->getAsString() == "empty"; + return d->getOperator()->getAsString() == "empty_dag_marker"; } // EscapeVariableName - Escape commas and other symbols not allowed |