maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Try to guess when the auto-generated cl::Sink option should be marked 'extern'. 

This would be much easier to do if the CommandLine library didn't use
global state. Global state is evil.

llvm-svn: 60659
This commit is contained in:
Mikhail Glushenkov 2008-12-07 16:42:47 +00:00
parent 35a46f808b
commit 0d88271490
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp
View File

@ -1427,7 +1427,7 @@ void EmitToolClassDefinition (const ToolDescription& D,
/// EmitOptionDefintions - Iterate over a list of option descriptions /// EmitOptionDefintions - Iterate over a list of option descriptions
/// and emit registration code. /// and emit registration code.
void EmitOptionDefintions (const OptionDescriptions& descs, void EmitOptionDefintions (const OptionDescriptions& descs,
bool HasSink, bool HasSink, bool HasExterns,
std::ostream& O) std::ostream& O)
{ {
std::vector<OptionDescription> Aliases; std::vector<OptionDescription> Aliases;
@ -1503,7 +1503,9 @@ void EmitOptionDefintions (const OptionDescriptions& descs,
// Emit the sink option. // Emit the sink option.
if (HasSink) if (HasSink)
O << "cl::list<std::string> " << SinkOptionName << "(cl::Sink);\n"; O << (HasExterns ? "extern cl" : "cl")
<< "::list<std::string> " << SinkOptionName
<< (HasExterns ? ";\n" : "(cl::Sink);\n");
O << '\n'; O << '\n';
} }
@ -1744,20 +1746,32 @@ void EmitIncludes(std::ostream& O) {
struct PluginData { struct PluginData {
OptionDescriptions OptDescs; OptionDescriptions OptDescs;
bool HasSink; bool HasSink;
bool HasExterns;
ToolDescriptions ToolDescs; ToolDescriptions ToolDescs;
RecordVector Edges; RecordVector Edges;
int Priority; int Priority;
}; };
/// HasSink - Go through the list of tool descriptions and check if /// HasSink - Go through the list of tool descriptions and check if
/// there is one with the 'sink' property set. /// there are any with the 'sink' property set.
bool HasSink(const ToolDescriptions& ToolDescs) { bool HasSink(const ToolDescriptions& ToolDescs) {
for (ToolDescriptions::const_iterator B = ToolDescs.begin(), for (ToolDescriptions::const_iterator B = ToolDescs.begin(),
E = ToolDescs.end(); B != E; ++B) E = ToolDescs.end(); B != E; ++B)
if ((*B)->isSink()) if ((*B)->isSink())
return true; return true;
return false; return false;
}
/// HasExterns - Go through the list of option descriptions and check
/// if there are any external options.
bool HasExterns(const OptionDescriptions& OptDescs) {
for (OptionDescriptions::const_iterator B = OptDescs.begin(),
E = OptDescs.end(); B != E; ++B)
if (B->second.isExtern())
return true;
return false;
} }
/// CollectPluginData - Collect tool and option properties, /// CollectPluginData - Collect tool and option properties,
@ -1773,6 +1787,7 @@ void CollectPluginData (const RecordKeeper& Records, PluginData& Data) {
const RecordVector& Tools = Records.getAllDerivedDefinitions("Tool"); const RecordVector& Tools = Records.getAllDerivedDefinitions("Tool");
CollectToolDescriptions(Tools.begin(), Tools.end(), Data.ToolDescs); CollectToolDescriptions(Tools.begin(), Tools.end(), Data.ToolDescs);
Data.HasSink = HasSink(Data.ToolDescs); Data.HasSink = HasSink(Data.ToolDescs);
Data.HasExterns = HasExterns(Data.OptDescs);
// Collect compilation graph edges. // Collect compilation graph edges.
const RecordVector& CompilationGraphs = const RecordVector& CompilationGraphs =
@ -1805,7 +1820,7 @@ void EmitPluginCode(const PluginData& Data, std::ostream& O) {
EmitIncludes(O); EmitIncludes(O);
// Emit global option registration code. // Emit global option registration code.
EmitOptionDefintions(Data.OptDescs, Data.HasSink, O); EmitOptionDefintions(Data.OptDescs, Data.HasSink, Data.HasExterns, O);
// Emit hook declarations. // Emit hook declarations.
EmitHookDeclarations(Data.ToolDescs, O); EmitHookDeclarations(Data.ToolDescs, O);