D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-27 01:53:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-2.064

Browse Source 
Conflicts:
	gen/runtime.cpp
	runtime/CMakeLists.txt
This commit is contained in:
Kai Nacke
2013-12-08 19:29:10 +01:00
parent 669319b924 aeba90b9f9
commit bdc1f44088
4 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gen/nested.cpp
View File

@@ -224,7 +224,7 @@ LLValue* DtoNestedContext(Loc loc, Dsymbol* sym)
return llvm::ConstantPointerNull::get(getVoidPtrType());
}
struct FuncDeclaration* frameToPass = 0;
FuncDeclaration* frameToPass = 0;
if (AggregateDeclaration *ad = sym->isAggregateDeclaration()) {
// If sym is a nested struct or a nested class, pass the frame
// of the function where sym is declared.