|
|
@@ -13,17 +13,17 @@
|
|
|
|
|
|
namespace Carbon {
|
|
|
|
|
|
-auto CodeGen::Make(llvm::Module& module, llvm::StringRef target_triple,
|
|
|
- llvm::raw_pwrite_stream& errors) -> std::optional<CodeGen> {
|
|
|
+auto CodeGen::Make(llvm::Module* module, llvm::StringRef target_triple,
|
|
|
+ llvm::raw_pwrite_stream* errors) -> std::optional<CodeGen> {
|
|
|
std::string error;
|
|
|
const llvm::Target* target =
|
|
|
llvm::TargetRegistry::lookupTarget(target_triple, error);
|
|
|
|
|
|
if (!target) {
|
|
|
- errors << "error: invalid target: " << error << "\n";
|
|
|
+ *errors << "error: invalid target: " << error << "\n";
|
|
|
return {};
|
|
|
}
|
|
|
- module.setTargetTriple(llvm::Triple(target_triple));
|
|
|
+ module->setTargetTriple(llvm::Triple(target_triple));
|
|
|
|
|
|
constexpr llvm::StringLiteral CPU = "generic";
|
|
|
constexpr llvm::StringLiteral Features = "";
|
|
|
@@ -45,7 +45,7 @@ auto CodeGen::EmitObject(llvm::raw_pwrite_stream& out) -> bool {
|
|
|
|
|
|
auto CodeGen::EmitCode(llvm::raw_pwrite_stream& out,
|
|
|
llvm::CodeGenFileType file_type) -> bool {
|
|
|
- module_.setDataLayout(target_machine_->createDataLayout());
|
|
|
+ module_->setDataLayout(target_machine_->createDataLayout());
|
|
|
|
|
|
// Using the legacy PM to generate the assembly since the new PM
|
|
|
// does not work with this yet.
|
|
|
@@ -53,11 +53,11 @@ auto CodeGen::EmitCode(llvm::raw_pwrite_stream& out,
|
|
|
llvm::legacy::PassManager pass;
|
|
|
// Note that this returns true on an error.
|
|
|
if (target_machine_->addPassesToEmitFile(pass, out, nullptr, file_type)) {
|
|
|
- errors_ << "error: unable to emit to this file\n";
|
|
|
+ *errors_ << "error: unable to emit to this file\n";
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- pass.run(module_);
|
|
|
+ pass.run(*module_);
|
|
|
return true;
|
|
|
}
|
|
|
|