[llvm-branch-commits] [llvm-gcc-branch] r106060 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/llvm-backend.cpp gcc/llvm-convert.cpp gcc/llvm-debug.cpp gcc/llvm-debug.h gcc/llvm-internal.h
Stuart Hastings
stuart at apple.com
Tue Jun 15 15:25:56 PDT 2010
Author: stuart
Date: Tue Jun 15 17:25:56 2010
New Revision: 106060
URL: http://llvm.org/viewvc/llvm-project?rev=106060&view=rev
Log:
Morbonize r105828 and r105829. Radar 7424645.
Modified:
llvm-gcc-4.2/branches/Apple/Morbo/ (props changed)
llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-backend.cpp
llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp
llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.h
llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-internal.h
Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 17:25:56 2010
@@ -1,2 +1,2 @@
/llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726,105504,105902
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726,105504,105828-105829,105902
Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-backend.cpp?rev=106060&r1=106059&r2=106060&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-backend.cpp Tue Jun 15 17:25:56 2010
@@ -512,6 +512,8 @@
if (!flag_pch_file &&
debug_info_level > DINFO_LEVEL_NONE)
TheDebugInfo = new DebugInfo(TheModule);
+ else
+ TheDebugInfo = 0;
}
/// performLateBackendInitialization - Set backend options that may only be
@@ -1007,7 +1009,8 @@
// Convert the AST to raw/ugly LLVM code.
Function *Fn;
{
- TreeToLLVM Emitter(fndecl);
+ TreeToLLVM *Emitter = new TreeToLLVM(fndecl);
+ // FIXME: should we store TheTreeToLLVM right here (current in constructor)?
enum symbol_visibility vis = DECL_VISIBILITY (fndecl);
if (vis != VISIBILITY_DEFAULT)
@@ -1015,7 +1018,8 @@
// visibility that's not supported by the target.
targetm.asm_out.visibility(fndecl, vis);
- Fn = Emitter.EmitFunction();
+ Fn = TheTreeToLLVM->EmitFunction();
+ Emitter->~TreeToLLVM();
}
#if 0
Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp?rev=106060&r1=106059&r2=106060&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp Tue Jun 15 17:25:56 2010
@@ -148,7 +148,7 @@
//===----------------------------------------------------------------------===//
/// TheTreeToLLVM - Keep track of the current function being compiled.
-static TreeToLLVM *TheTreeToLLVM = 0;
+TreeToLLVM *TheTreeToLLVM = 0;
const TargetData &getTargetData() {
return *TheTarget->getTargetData();
@@ -157,7 +157,7 @@
/// EmitDebugInfo - Return true if debug info is to be emitted for current
/// function.
bool TreeToLLVM::EmitDebugInfo() {
- if (TheDebugInfo && !DECL_IGNORED_P(getFUNCTION_DECL()))
+ if (TheDebugInfo && getFUNCTION_DECL() && !DECL_IGNORED_P(getFUNCTION_DECL()))
return true;
return false;
}
@@ -616,7 +616,7 @@
SeenBlocks.clear();
if (EmitDebugInfo())
- TheDebugInfo->EmitFunctionStart(FnDecl, Fn, Builder.GetInsertBlock());
+ TheDebugInfo->EmitFunctionStart(FnDecl);
// Loop over all of the arguments to the function, setting Argument names and
// creating argument alloca's for the PARM_DECLs in case their address is
@@ -631,7 +631,7 @@
ABIConverter.HandleReturnType(TREE_TYPE(TREE_TYPE(FnDecl)), FnDecl,
DECL_BUILT_IN(FnDecl));
// Remember this for use by FinishFunctionBody.
- TheTreeToLLVM->ReturnOffset = Client.Offset;
+ ReturnOffset = Client.Offset;
// Prepend the static chain (if any) to the list of arguments.
tree Args = static_chain ? static_chain : DECL_ARGUMENTS(FnDecl);
Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp?rev=106060&r1=106059&r2=106060&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp Tue Jun 15 17:25:56 2010
@@ -275,7 +275,7 @@
// regions to arrive at 'desired'. This was inspired (cribbed from)
// by GCC's cfglayout.c:change_scope().
void DebugInfo::change_regions(tree desired, tree grand) {
- tree current_lexical_block = getCurrentLexicalBlock();
+ tree current_lexical_block = getCurrentLexicalBlock(), t;
// FIXME: change_regions is currently never called with desired ==
// grand, but it should be fixed so nothing weird happens if they're
// equal.
@@ -286,29 +286,34 @@
RegionStack.pop_back();
}
DebugInfo::push_regions(desired, grand);
- setCurrentLexicalBlock(desired);
+ // There's no point in declaring an empty (declares no variables)
+ // lexical BLOCK as the current lexical BLOCK. Locate nearest
+ // non-empty ancestor BLOCK and declare that.
+ for (t = desired; TREE_CODE(t) == BLOCK; t = BLOCK_SUPERCONTEXT(t))
+ if (BLOCK_VARS(t))
+ break;
+ setCurrentLexicalBlock(t);
}
-/// EmitFunctionStart - Constructs the debug code for entering a function -
-/// "llvm.dbg.func.start."
-void DebugInfo::EmitFunctionStart(tree FnDecl, Function *Fn,
- BasicBlock *CurBB) {
- setCurrentLexicalBlock(FnDecl);
-
+/// CreateSubprogramFromFnDecl - Constructs the debug code for
+/// entering a function - "llvm.dbg.func.start."
+DISubprogram DebugInfo::CreateSubprogramFromFnDecl(tree FnDecl) {
+ DISubprogram SPDecl;
+ bool SPDeclIsSet = false;
+ // True if we're currently generating LLVM for this function.
+ bool definition = llvm_set_decl_p(FnDecl);
DIType FNType = getOrCreateType(TREE_TYPE(FnDecl));
std::map<tree_node *, WeakVH >::iterator I = SPCache.find(FnDecl);
if (I != SPCache.end()) {
- DISubprogram SPDecl(cast<MDNode>(I->second));
- DISubprogram SP =
- DebugFactory.CreateSubprogramDefinition(SPDecl);
- SPDecl.getNode()->replaceAllUsesWith(SP.getNode());
-
- // Push function on region stack.
- RegionStack.push_back(WeakVH(SP.getNode()));
- RegionMap[FnDecl] = WeakVH(SP.getNode());
- return;
- }
+ SPDecl = DISubprogram(cast<MDNode>(I->second));
+ SPDeclIsSet = true;
+ // If we've already created the defining instance, OR this
+ // invocation won't create the defining instance, return what we
+ // already have.
+ if (SPDecl.isDefinition() || !definition)
+ return SPDecl;
+ }
bool ArtificialFnWithAbstractOrigin = false;
// If this artificial function has abstract origin then put this function
@@ -322,26 +327,34 @@
getOrCreateFile(main_input_filename) :
findRegion (DECL_CONTEXT(FnDecl));
+ // Declare block_invoke functions at file scope for GDB.
+ if (BLOCK_SYNTHESIZED_FUNC(FnDecl))
+ SPContext = findRegion(NULL_TREE);
+
// Creating context may have triggered creation of this SP descriptor. So
// check the cache again.
- I = SPCache.find(FnDecl);
- if (I != SPCache.end()) {
- DISubprogram SPDecl(cast<MDNode>(I->second));
- DISubprogram SP =
- DebugFactory.CreateSubprogramDefinition(SPDecl);
- SPDecl.getNode()->replaceAllUsesWith(SP.getNode());
-
- // Push function on region stack.
- RegionStack.push_back(WeakVH(SP.getNode()));
- RegionMap[FnDecl] = WeakVH(SP.getNode());
- return;
- }
+ if (!SPDeclIsSet) {
+ I = SPCache.find(FnDecl);
+ if (I != SPCache.end()) {
+ SPDecl = DISubprogram(cast<MDNode>(I->second));
+ DISubprogram SP =
+ DebugFactory.CreateSubprogramDefinition(SPDecl);
+ SPDecl.getNode()->replaceAllUsesWith(SP.getNode());
+ // Push function on region stack.
+ RegionStack.push_back(WeakVH(SP.getNode()));
+ RegionMap[FnDecl] = WeakVH(SP.getNode());
+ return SP;
+ }
+ }
// Gather location information.
expanded_location Loc = GetNodeLocation(FnDecl, false);
- StringRef LinkageName = getLinkageName(FnDecl);
+ // If the name isn't public, omit the linkage name. Adding a
+ // linkage name to a class method can confuse GDB.
+ StringRef LinkageName = TREE_PUBLIC(FnDecl) ?
+ getLinkageName(FnDecl) : StringRef();
- unsigned lineno = CurLineNo;
+ unsigned lineno = LOCATION_LINE(Loc);
if (isCopyOrDestroyHelper(FnDecl))
lineno = 0;
@@ -356,23 +369,41 @@
}
StringRef FnName = getFunctionName(FnDecl);
-
+ // If the Function * hasn't been created yet, use a bogus value for
+ // the debug internal linkage bit.
+ bool hasInternalLinkage = true;
+ Function *Fn = 0;
+ if (GET_DECL_LLVM_INDEX(FnDecl)) {
+ Fn = cast<Function>DECL_LLVM(FnDecl);
+ if (Fn)
+ hasInternalLinkage = Fn->hasInternalLinkage();
+ }
DISubprogram SP =
DebugFactory.CreateSubprogram(SPContext,
FnName, FnName,
LinkageName,
getOrCreateFile(Loc.file), lineno,
FNType,
- Fn->hasInternalLinkage(),
- true /*definition*/,
+ hasInternalLinkage,
+ definition,
Virtuality, VIndex, ContainingType,
- DECL_ARTIFICIAL (FnDecl), optimize);
+ DECL_ARTIFICIAL (FnDecl), optimize,
+ Fn);
SPCache[FnDecl] = WeakVH(SP.getNode());
+ RegionMap[FnDecl] = WeakVH(SP.getNode());
+ if (SPDeclIsSet && SPDecl.getNode() != SP.getNode())
+ SPDecl.getNode()->replaceAllUsesWith(SP.getNode());
+ return SP;
+}
+/// EmitFunctionStart - Constructs the debug code for entering a function -
+/// "llvm.dbg.func.start."
+void DebugInfo::EmitFunctionStart(tree FnDecl) {
+ setCurrentLexicalBlock(FnDecl);
+ DISubprogram SP = CreateSubprogramFromFnDecl(FnDecl);
// Push function on region stack.
RegionStack.push_back(WeakVH(SP.getNode()));
- RegionMap[FnDecl] = WeakVH(SP.getNode());
}
/// getOrCreateNameSpace - Get name space descriptor for the tree node.
@@ -405,12 +436,20 @@
DIType Ty = getOrCreateType(Node);
return DIDescriptor(Ty.getNode());
} else if (DECL_P (Node)) {
- if (TREE_CODE (Node) == NAMESPACE_DECL) {
+ switch (TREE_CODE(Node)) {
+ default:
+ /// What kind of DECL is this?
+ return findRegion (DECL_CONTEXT (Node));
+ case NAMESPACE_DECL: {
DIDescriptor NSContext = findRegion(DECL_CONTEXT(Node));
DINameSpace NS = getOrCreateNameSpace(Node, NSContext);
return DIDescriptor(NS.getNode());
}
- return findRegion (DECL_CONTEXT (Node));
+ case FUNCTION_DECL: {
+ DISubprogram SP = CreateSubprogramFromFnDecl(Node);
+ return SP;
+ }
+ }
} else if (TREE_CODE(Node) == BLOCK) {
// TREE_BLOCK is GCC's lexical block.
// Recursively create all necessary contexts:
@@ -622,7 +661,7 @@
sprintf(FwdTypeName, "fwd.type.%d", FwdTypeCount++);
llvm::DIType FwdType =
DebugFactory.CreateCompositeType(llvm::dwarf::DW_TAG_subroutine_type,
- getOrCreateFile(main_input_filename),
+ findRegion(TYPE_CONTEXT(type)),
FwdTypeName,
getOrCreateFile(main_input_filename),
0, 0, 0, 0, 0,
@@ -710,7 +749,7 @@
StringRef PName = FromTy.getName();
DIType PTy =
- DebugFactory.CreateDerivedType(Tag, findRegion(TYPE_CONTEXT(type)),
+ DebugFactory.CreateDerivedType(Tag, findRegion(TYPE_CONTEXT(type)),
Tag == DW_TAG_pointer_type ?
StringRef() : PName,
getOrCreateFile(main_input_filename),
Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.h?rev=106060&r1=106059&r2=106060&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.h Tue Jun 15 17:25:56 2010
@@ -118,9 +118,13 @@
// by GCC's cfglayout.c:change_scope().
void change_regions(tree_node *desired, tree_node *grand);
- /// EmitFunctionStart - Constructs the debug code for entering a function -
+ /// CreateSubprogramFromFnDecl - Constructs the debug code for entering a function -
/// "llvm.dbg.func.start."
- void EmitFunctionStart(tree_node *FnDecl, Function *Fn, BasicBlock *CurBB);
+ DISubprogram CreateSubprogramFromFnDecl(tree_node *FnDecl);
+
+ /// EmitFunctionStart - Constructs the debug code for entering a function -
+ /// "llvm.dbg.func.start", and pushes it onto the RegionStack.
+ void EmitFunctionStart(tree_node *FnDecl);
/// EmitFunctionEnd - Constructs the debug code for exiting a declarative
/// region - "llvm.dbg.region.end."
Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-internal.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-internal.h?rev=106060&r1=106059&r2=106060&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-internal.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-internal.h Tue Jun 15 17:25:56 2010
@@ -75,7 +75,7 @@
extern llvm::Module *TheModule;
/// TheDebugInfo - This object is responsible for gather all debug information.
-/// If it's value is NULL then no debug information should be gathered.
+/// If its value is NULL then no debug information should be gathered.
extern llvm::DebugInfo *TheDebugInfo;
/// TheTarget - The current target being compiled for.
@@ -281,6 +281,7 @@
BasicBlock *ReturnBB;
BasicBlock *UnwindBB;
unsigned ReturnOffset;
+
// Lexical BLOCKS that we have previously seen and processed.
treeset SeenBlocks;
@@ -397,6 +398,10 @@
// allocation would change with -g, and users dislike that.
void switchLexicalBlock(tree_node *exp);
+ /// StartFunctionBody - Start the emission of 'FnDecl', outputing all
+ /// declarations for parameters and setting things up.
+ void StartFunctionBody();
+
private: // Helper functions.
// Walk over the lexical BLOCK() tree of the given FUNCTION_DECL;
@@ -405,10 +410,6 @@
// the given set.
void setLexicalBlockDepths(tree_node *t, treeset &s, unsigned level);
- /// StartFunctionBody - Start the emission of 'fndecl', outputing all
- /// declarations for parameters and setting things up.
- void StartFunctionBody();
-
/// FinishFunctionBody - Once the body of the function has been emitted, this
/// cleans up and returns the result function.
Function *FinishFunctionBody();
@@ -607,6 +608,9 @@
Constant *EmitLV_LABEL_DECL(tree_node *exp);
};
+/// TheTreeToLLVM - Keep track of the current function being compiled.
+extern TreeToLLVM *TheTreeToLLVM;
+
/// TreeConstantToLLVM - An instance of this class is created and used to
/// convert tree constant values to LLVM. This is primarily for things like
/// global variable initializers.
More information about the llvm-branch-commits
mailing list