#include "llvm/CodeGen/Analysis.h"
#include "llvm/CodeGen/CommandFlags.h"
#include "llvm/IR/Constants.h"
+#include "llvm/IR/DiagnosticInfo.h"
+#include "llvm/IR/DiagnosticPrinter.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/IR/Verifier.h"
return false;
}
+static void diagnosticHandler(const DiagnosticInfo &DI, void *Context) {
+ assert(DI.getSeverity() == DS_Error && "Only expecting errors");
+ const auto &BDI = cast<BitcodeDiagnosticInfo>(DI);
+ std::error_code EC = BDI.getError();
+ if (EC == BitcodeError::InvalidBitcodeSignature)
+ return;
+
+ std::string ErrStorage;
+ {
+ raw_string_ostream OS(ErrStorage);
+ DiagnosticPrinterRawOStream DP(OS);
+ DI.print(DP);
+ }
+ message(LDPL_FATAL, "LLVM gold plugin has failed to create LTO module: %s",
+ ErrStorage.c_str());
+}
+
/// Called by gold to see whether this file is one that our plugin can handle.
/// We'll try to open it and register all the symbols with add_symbol if
/// possible.
BufferRef = Buffer->getMemBufferRef();
}
+ Context.setDiagnosticHandler(diagnosticHandler);
ErrorOr<std::unique_ptr<object::IRObjectFile>> ObjOrErr =
- object::IRObjectFile::createIRObjectFile(BufferRef, Context);
+ object::IRObjectFile::create(BufferRef, Context);
std::error_code EC = ObjOrErr.getError();
- if (EC == BitcodeError::InvalidBitcodeSignature ||
- EC == object::object_error::invalid_file_type ||
+ if (EC == object::object_error::invalid_file_type ||
EC == object::object_error::bitcode_section_not_found)
return LDPS_OK;
llvm_unreachable("Unknown resolution");
}
-static GlobalObject *makeInternalReplacement(GlobalObject *GO) {
- Module *M = GO->getParent();
- GlobalObject *Ret;
- if (auto *F = dyn_cast<Function>(GO)) {
- if (F->materialize())
- message(LDPL_FATAL, "LLVM gold plugin has failed to read a function");
-
- auto *NewF = Function::Create(F->getFunctionType(), F->getLinkage(),
- F->getName(), M);
-
- ValueToValueMapTy VM;
- Function::arg_iterator NewI = NewF->arg_begin();
- for (auto &Arg : F->args()) {
- NewI->setName(Arg.getName());
- VM[&Arg] = NewI;
- ++NewI;
- }
-
- NewF->getBasicBlockList().splice(NewF->end(), F->getBasicBlockList());
- for (auto &BB : *NewF) {
- for (auto &Inst : BB)
- RemapInstruction(&Inst, VM, RF_IgnoreMissingEntries);
- }
-
- Ret = NewF;
- F->deleteBody();
- } else {
- auto *Var = cast<GlobalVariable>(GO);
- Ret = new GlobalVariable(
- *M, Var->getType()->getElementType(), Var->isConstant(),
- Var->getLinkage(), Var->getInitializer(), Var->getName(),
- nullptr, Var->getThreadLocalMode(), Var->getType()->getAddressSpace(),
- Var->isExternallyInitialized());
- Var->setInitializer(nullptr);
- }
- Ret->copyAttributesFrom(GO);
- Ret->setLinkage(GlobalValue::InternalLinkage);
- Ret->setComdat(GO->getComdat());
-
- return Ret;
-}
-
namespace {
class LocalValueMaterializer : public ValueMaterializer {
DenseSet<GlobalValue *> &Dropped;
+ DenseMap<GlobalObject *, GlobalObject *> LocalVersions;
public:
LocalValueMaterializer(DenseSet<GlobalValue *> &Dropped) : Dropped(Dropped) {}
}
Value *LocalValueMaterializer::materializeValueFor(Value *V) {
- auto *GV = dyn_cast<GlobalValue>(V);
- if (!GV)
+ auto *GO = dyn_cast<GlobalObject>(V);
+ if (!GO)
return nullptr;
- if (!Dropped.count(GV))
+
+ auto I = LocalVersions.find(GO);
+ if (I != LocalVersions.end())
+ return I->second;
+
+ if (!Dropped.count(GO))
return nullptr;
- assert(!isa<GlobalAlias>(GV) && "Found alias point to weak alias.");
- return makeInternalReplacement(cast<GlobalObject>(GV));
+
+ Module &M = *GO->getParent();
+ GlobalValue::LinkageTypes L = GO->getLinkage();
+ GlobalObject *Declaration;
+ if (auto *F = dyn_cast<Function>(GO)) {
+ Declaration = Function::Create(F->getFunctionType(), L, "", &M);
+ } else {
+ auto *Var = cast<GlobalVariable>(GO);
+ Declaration = new GlobalVariable(M, Var->getType()->getElementType(),
+ Var->isConstant(), L,
+ /*Initializer*/ nullptr);
+ }
+ Declaration->takeName(GO);
+ Declaration->copyAttributesFrom(GO);
+
+ GO->setLinkage(GlobalValue::InternalLinkage);
+ GO->setName(Declaration->getName());
+ Dropped.erase(GO);
+ GO->replaceAllUsesWith(Declaration);
+
+ LocalVersions[Declaration] = GO;
+
+ return GO;
}
static Constant *mapConstantToLocalCopy(Constant *C, ValueToValueMapTy &VM,
return MapValue(C, VM, RF_IgnoreMissingEntries, nullptr, Materializer);
}
+static void freeSymName(ld_plugin_symbol &Sym) {
+ free(Sym.name);
+ free(Sym.comdat_key);
+ Sym.name = nullptr;
+ Sym.comdat_key = nullptr;
+}
+
static std::unique_ptr<Module>
getModuleForFile(LLVMContext &Context, claimed_file &F, raw_fd_ostream *ApiFile,
StringSet<> &Internalize, StringSet<> &Maybe) {
MemoryBufferRef BufferRef(StringRef((const char *)View, File.filesize), "");
ErrorOr<std::unique_ptr<object::IRObjectFile>> ObjOrErr =
- object::IRObjectFile::createIRObjectFile(BufferRef, Context);
+ object::IRObjectFile::create(BufferRef, Context);
if (std::error_code EC = ObjOrErr.getError())
message(LDPL_FATAL, "Could not read bitcode from file : %s",
*ApiFile << Sym.name << ' ' << getResolutionName(Resolution) << '\n';
GlobalValue *GV = Obj.getSymbolGV(ObjSym.getRawDataRefImpl());
- if (!GV)
+ if (!GV) {
+ freeSymName(Sym);
continue; // Asm symbol.
+ }
if (Resolution != LDPR_PREVAILING_DEF_IRONLY && GV->hasCommonLinkage()) {
// Common linkage is special. There is no single symbol that wins the
// The IR linker does that for us if we just pass it every common GV.
// We still have to keep track of LDPR_PREVAILING_DEF_IRONLY so we
// internalize once the IR linker has done its job.
+ freeSymName(Sym);
continue;
}
}
}
- free(Sym.name);
- free(Sym.comdat_key);
- Sym.name = nullptr;
- Sym.comdat_key = nullptr;
+ freeSymName(Sym);
}
ValueToValueMapTy VM;
// expression is being dropped. If that is the case, that GV must be copied.
Constant *Aliasee = GA->getAliasee();
Constant *Replacement = mapConstantToLocalCopy(Aliasee, VM, &Materializer);
- if (Aliasee != Replacement)
- GA->setAliasee(Replacement);
+ GA->setAliasee(Replacement);
}
for (auto *GV : Drop)
projects / oota-llvm.git / blobdiff