intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-04 03:26:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert r225085, it caused PR22096.

Browse Source 
PR22096 has several test cases that assert that look fairly different. I'm
adding one of those as an automated test, but when relanding the other cases
should probably be checked as well.

llvm-svn: 225361
This commit is contained in:
Nico Weber
2015-01-07 18:23:08 +00:00
parent 4d77fdf311
commit eac50037fb
3 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/CodeGen/CGCall.cpp
View File

@@ -2680,6 +2680,10 @@ void CodeGenFunction::EmitCallArgs(CallArgList &Args,
const FunctionDecl *CalleeDecl,
unsigned ParamsToSkip,
bool ForceColumnInfo) {
CGDebugInfo *DI = getDebugInfo();
SourceLocation CallLoc;
if (DI) CallLoc = DI->getLocation();
// We *have* to evaluate arguments from right to left in the MS C++ ABI,
// because arguments are destroyed left to right in the callee.
if (CGM.getTarget().getCXXABI().areArgsDestroyedLeftToRightInCallee()) {
@@ -2700,6 +2704,8 @@ void CodeGenFunction::EmitCallArgs(CallArgList &Args,
EmitCallArg(Args, *Arg, ArgTypes[I]);
emitNonNullArgCheck(*this, Args.back().RV, ArgTypes[I], Arg->getExprLoc(),
CalleeDecl, ParamsToSkip + I);
// Restore the debug location.
if (DI) DI->EmitLocation(Builder, CallLoc, ForceColumnInfo);
}
// Un-reverse the arguments we just evaluated so they match up with the LLVM
@@ -2714,6 +2720,8 @@ void CodeGenFunction::EmitCallArgs(CallArgList &Args,
EmitCallArg(Args, *Arg, ArgTypes[I]);
emitNonNullArgCheck(*this, Args.back().RV, ArgTypes[I], Arg->getExprLoc(),
CalleeDecl, ParamsToSkip + I);
// Restore the debug location.
if (DI) DI->EmitLocation(Builder, CallLoc, ForceColumnInfo);
}
}

3
clang/lib/CodeGen/CGDebugInfo.h
View File

@@ -222,6 +222,9 @@ public:
/// invalid it is ignored.
void setLocation(SourceLocation Loc);
/// getLocation - Return the current source location.
SourceLocation getLocation() const { return CurLoc; }
/// EmitLocation - Emit metadata to indicate a change in line/column
/// information in the source file.
/// \param ForceColumnInfo Assume DebugColumnInfo option is true.

26
clang/test/CodeGenCXX/crash.cpp
View File

@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -std=c++11 -emit-llvm-only
// RUN: %clang_cc1 -emit-obj -o %t -gline-tables-only -O2 -std=c++11 %s
// CHECK that we don't crash.
// PR11676's example is ill-formed:
@@ -33,3 +34,28 @@ template <class ELFT> void finalizeDefaultAtomValues() {
void f() { finalizeDefaultAtomValues<int>(); }
}
namespace PR22096 {
class _String_val {
union _Bxty { int i; } _Bx;
};
struct string : public _String_val {
string(const char *_Ptr) : _String_val() {}
};
int ConvertIPv4NumberToIPv6Number(int);
struct IPEndPoint {
IPEndPoint();
IPEndPoint(const int &address, int port);
const int &address() const {}
};
struct SourceAddressTokenTest {
SourceAddressTokenTest()
: ip4_dual_(ConvertIPv4NumberToIPv6Number(ip4_.address()), 1) {}
const string kPrimary = "<primary>";
IPEndPoint ip4_;
IPEndPoint ip4_dual_;
} s;
}