From 2cea7bdef905f85845eb60ad87d272cc4bd54287 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Sat, 17 Oct 2009 20:08:30 +0000 Subject: [PATCH] Disallow multiple instances of PluginPriority. Several instances of PluginPriority in a single file most probably signifies a programming error. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84350 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/LLVMC/MultiplePluginPriorities.td | 10 ++++++++++ utils/TableGen/LLVMCConfigurationEmitter.cpp | 14 ++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 test/LLVMC/MultiplePluginPriorities.td diff --git a/test/LLVMC/MultiplePluginPriorities.td b/test/LLVMC/MultiplePluginPriorities.td new file mode 100644 index 00000000000..721b7ccd0d2 --- /dev/null +++ b/test/LLVMC/MultiplePluginPriorities.td @@ -0,0 +1,10 @@ +// Check that multiple plugin priorities are not allowed. +// RUN: ignore tblgen -I %p/../../include --gen-llvmc %s |& grep "More than one 'PluginPriority' instance found" + +include "llvm/CompilerDriver/Common.td" + +def Graph : CompilationGraph<[]>; + +def Priority1 : PluginPriority<1>; + +def Priority2 : PluginPriority<2>; diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp index 06afaf73a02..6dfd1b362d5 100644 --- a/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -775,11 +775,17 @@ void FillInEdgeVector(RecordVector::const_iterator B, /// CalculatePriority - Calculate the priority of this plugin. int CalculatePriority(RecordVector::const_iterator B, RecordVector::const_iterator E) { - int total = 0; - for (; B!=E; ++B) { - total += static_cast((*B)->getValueAsInt("priority")); + int priority = 0; + + if (B != E) { + priority = static_cast((*B)->getValueAsInt("priority")); + + if (++B != E) + throw std::string("More than one 'PluginPriority' instance found: " + "most probably an error!"); } - return total; + + return priority; } /// NotInGraph - Helper function object for FilterNotInGraph.