Skip to content

Catch up with upstream #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 28, 2019
Merged

Catch up with upstream #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e3052d
CodeGenType enum moded to `llvm` namespace
ppenzin Nov 27, 2019
2397cf4
MaybeAlign for AllocaInst
ppenzin Nov 27, 2019
54cd7b7
Acomodate local FileCheck
ppenzin Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/CodeGen/BackendUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,11 @@ bool EmitAssemblyHelper::AddEmitPasses(BackendAction Action,

// Normal mode, emit a .s or .o file by running the code generator. Note,
// this also adds codegenerator level optimization passes.
TargetMachine::CodeGenFileType CGFT = TargetMachine::CGFT_AssemblyFile;
CodeGenFileType CGFT = CGFT_AssemblyFile;
if (Action == Backend_EmitObj)
CGFT = TargetMachine::CGFT_ObjectFile;
CGFT = CGFT_ObjectFile;
else if (Action == Backend_EmitMCNull)
CGFT = TargetMachine::CGFT_Null;
CGFT = CGFT_Null;
else
assert(Action == Backend_EmitAssembly && "Invalid action!");

Expand Down
2 changes: 1 addition & 1 deletion lib/CodeGen/CGDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ CodeGenFunction::EmitEquivalenceSet(const EquivalenceSet *S) {
new llvm::AllocaInst(
CGM.Int8Ty, DL.getAllocaAddrSpace(),
llvm::ConstantInt::get(CGM.SizeTy, HighestBound - LowestBound),
CGM.getDataLayout().getTypeStoreSize(CGM.DoubleTy)),
llvm::MaybeAlign(CGM.getDataLayout().getTypeStoreSize(CGM.DoubleTy))),
"equivalence-set");
#if 0
AllocaInst(Type *Ty, unsigned AddrSpace,
Expand Down
2 changes: 1 addition & 1 deletion test/lit.site.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ except KeyError:

# Let the main config do the real work.
config.test_dir = "@FORT_SOURCE_DIR@/test"
config.file_check = "@LLVM_BINARY_DIR@/bin/FileCheck"
config.file_check = "@FORT_BINARY_DIR@/bin/FileCheck"
lit_config.load_config(config, "@FORT_SOURCE_DIR@/test/lit.cfg")

7 changes: 3 additions & 4 deletions tools/driver/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,12 @@ static bool EmitFile(llvm::raw_pwrite_stream &Out, llvm::Module *Module,
if (Action == Backend_EmitObj || Action == Backend_EmitAssembly) {
llvm::Module &Mod = *Module;

llvm::TargetMachine::CodeGenFileType CGFT =
llvm::TargetMachine::CGFT_AssemblyFile;
CodeGenFileType CGFT = CGFT_AssemblyFile;

if (Action == Backend_EmitObj)
CGFT = llvm::TargetMachine::CGFT_ObjectFile;
CGFT = CGFT_ObjectFile;
else if (Action == Backend_EmitMCNull)
CGFT = llvm::TargetMachine::CGFT_Null;
CGFT = CGFT_Null;
else
assert(Action == Backend_EmitAssembly && "Invalid action!");

Expand Down