Skip to content
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

Jump to bottom

Fix compilation on LLVM svn #18519

Merged
merged 1 commit into from
Sep 16, 2016
Merged

Fix compilation on LLVM svn #18519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/cgutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static DIType julia_type_to_di(jl_value_t *jt, DIBuilder *dbuilder, bool isboxed
0, // LineNumber
8 * jdt->size, // SizeInBits
8 * jdt->layout->alignment, // AlignInBits
0, // Flags
DIFlagZero, // Flags
NULL, // DerivedFrom
DINodeArray(), // Elements
dwarf::DW_LANG_Julia, // RuntimeLanguage
Expand Down
54 changes: 30 additions & 24 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ legacy::PassManager *jl_globalPM;
PassManager *jl_globalPM;
#endif

#ifdef LLVM40
#define DIFlagZero (DINode::FlagZero)
#else
#define DIFlagZero (0)
#endif

#ifndef LLVM35
#define AddrSpaceCastInst BitCastInst
#endif
Expand Down Expand Up @@ -4288,20 +4294,20 @@ static std::unique_ptr<Module> emit_function(jl_method_instance_t *lam, jl_code_
#else
SP = dbuilder.createFunction(CU,
#endif
dbgFuncName, // Name
f->getName(), // LinkageName
topfile, // File
0, // LineNo
subrty, // Ty
false, // isLocalToUnit
true, // isDefinition
0, // ScopeLine
0, // Flags
true, // isOptimized
dbgFuncName, // Name
f->getName(), // LinkageName
topfile, // File
0, // LineNo
subrty, // Ty
false, // isLocalToUnit
true, // isDefinition
0, // ScopeLine
DIFlagZero, // Flags
true, // isOptimized
#ifdef LLVM38
nullptr); // Template Parameters
nullptr); // Template Parameters
#else
f); // Function
f); // Function
#endif
topdebugloc = DebugLoc::get(toplineno, 0, SP, NULL);
#ifdef LLVM38
Expand All @@ -4327,11 +4333,11 @@ static std::unique_ptr<Module> emit_function(jl_method_instance_t *lam, jl_code_
jl_symbol_name(argname), // Variable name
ctx.sret + i + 1, // Argument number (1-based)
topfile, // File
toplineno == -1 ? 0 : toplineno, // Line
toplineno == -1 ? 0 : toplineno, // Line
// Variable type
julia_type_to_di(varinfo.value.typ, &dbuilder, false),
AlwaysPreserve, // May be deleted if optimized out
0); // Flags (TODO: Do we need any)
AlwaysPreserve, // May be deleted if optimized out
DIFlagZero); // Flags (TODO: Do we need any)
#else
varinfo.dinfo = dbuilder.createLocalVariable(
llvm::dwarf::DW_TAG_arg_variable, // Tag
Expand All @@ -4350,12 +4356,12 @@ static std::unique_ptr<Module> emit_function(jl_method_instance_t *lam, jl_code_
ctx.slots[ctx.vaSlot].dinfo = dbuilder.createParameterVariable(
SP, // Scope (current function will be fill in later)
std::string(jl_symbol_name(slot_symbol(ctx.vaSlot, &ctx))) + "...", // Variable name
ctx.sret + nreq + 1, // Argument number (1-based)
topfile, // File
toplineno == -1 ? 0 : toplineno, // Line (for now, use lineno of the function)
ctx.sret + nreq + 1, // Argument number (1-based)
topfile, // File
toplineno == -1 ? 0 : toplineno, // Line (for now, use lineno of the function)
julia_type_to_di(ctx.slots[ctx.vaSlot].value.typ, &dbuilder, false),
AlwaysPreserve, // May be deleted if optimized out
0); // Flags (TODO: Do we need any)
DIFlagZero); // Flags (TODO: Do we need any)
#else
ctx.slots[ctx.vaSlot].dinfo = dbuilder.createLocalVariable(
llvm::dwarf::DW_TAG_arg_variable, // Tag
Expand Down Expand Up @@ -4385,10 +4391,10 @@ static std::unique_ptr<Module> emit_function(jl_method_instance_t *lam, jl_code_
topfile, // File
toplineno == -1 ? 0 : toplineno, // Line (for now, use lineno of the function)
julia_type_to_di(varinfo.value.typ, &dbuilder, false), // Variable type
AlwaysPreserve, // May be deleted if optimized out
0 // Flags (TODO: Do we need any)
AlwaysPreserve, // May be deleted if optimized out
DIFlagZero // Flags (TODO: Do we need any)
#ifndef LLVM38
,0 // Argument number (1-based)
,0 // Argument number (1-based)
#endif
);
}
Expand Down Expand Up @@ -4770,7 +4776,7 @@ static std::unique_ptr<Module> emit_function(jl_method_instance_t *lam, jl_code_
false,
true,
0,
0,
DIFlagZero,
true,
nullptr);
MDNode *inlinedAt = NULL;
Expand Down Expand Up @@ -5246,7 +5252,7 @@ static void init_julia_llvm_env(Module *m)
71, // At the time of this writing. Not sure if it's worth it to keep this in sync
0 * 8, // sizeof(jl_value_t) * 8,
__alignof__(void*) * 8, // __alignof__(jl_value_t) * 8,
0, // Flags
DIFlagZero, // Flags
#ifdef LLVM37
nullptr, // Derived from
nullptr); // Elements - will be corrected later
Expand Down