Wiki Roadmap Timeline Tickets New Ticket Source Search Help / Guide About Trac Login

Changeset 1576:4551475bc6b6

Show
Ignore:
Timestamp:
08/25/09 15:35:43 (3 years ago)
Author:
Benjamin Kramer <benny.kra@gmail.com>
branch:
default
Message:

Kill off StripMetaData?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gen/main.cpp

    r1570 r1576  
    939939        for (int i = 0; i < llvmModules.size(); i++) 
    940940        { 
    941 #if USE_METADATA 
    942             //FIXME: workaround for llvm metadata bug: 
    943             //  the LinkInModule call asserts with metadata unstripped 
    944             llvm::ModulePass* stripMD = createStripMetaData(); 
    945             stripMD->runOnModule(*llvmModules[i]); 
    946             delete stripMD; 
    947 #endif // USE_METADATA 
    948941            if(linker.LinkInModule(llvmModules[i], &errormsg)) 
    949942                error("%s", errormsg.c_str()); 
  • gen/optimizer.cpp

    r1558 r1576  
    5959    cl::ZeroOrMore); 
    6060 
    61 // Not recommended; metadata currently triggers an assert in the backend... 
    62 static cl::opt<bool> 
    63 disableStripMetaData("disable-strip-metadata", 
    64     cl::desc("Disable default metadata stripping (not recommended)"), 
    65     cl::ZeroOrMore); 
    66  
    6761static cl::opt<opts::BoolOrDefaultAdapter, false, opts::FlagParser> 
    6862enableInlining("inlining", 
     
    223217bool ldc_optimize_module(llvm::Module* m) 
    224218{ 
    225     if (!optimize()) { 
    226 #if USE_METADATA 
    227         if (!disableStripMetaData) { 
    228             // This one always needs to run if metadata is generated, because 
    229             // the code generator will assert if it's not used. 
    230             ModulePass* stripMD = createStripMetaData(); 
    231             stripMD->runOnModule(*m); 
    232             delete stripMD; 
    233         } 
    234 #endif 
     219    if (!optimize()) 
    235220        return false; 
    236     } 
    237221 
    238222    PassManager pm; 
     
    271255        addPassesForOptLevel(pm); 
    272256 
    273 #if USE_METADATA 
    274     if (!disableStripMetaData) { 
    275         // This one is purposely not disabled by disableLangSpecificPasses 
    276         // because the code generator will assert if it's not used. 
    277         addPass(pm, createStripMetaData()); 
    278     } 
    279 #endif // USE_METADATA 
    280  
    281257    pm.run(*m); 
    282258    return true; 
  • gen/passes/Passes.h

    r1558 r1576  
    1313#if USE_METADATA 
    1414llvm::FunctionPass* createGarbageCollect2Stack(); 
    15 llvm::ModulePass* createStripMetaData(); 
    1615#endif // USE_METADATA 
    1716 
Copyright © 2008, LDC Development Team.