diff options
| author | Dehao Chen <dehao@google.com> | 2017-08-27 22:22:39 +0000 |
|---|---|---|
| committer | Dehao Chen <dehao@google.com> | 2017-08-27 22:22:39 +0000 |
| commit | 191b24d3d27d83715f0241c551bab25722de39fb (patch) | |
| tree | 0b1e2946b321c35dc1684d668b5089326618d919 /llvm/lib/Transforms/Utils | |
| parent | 93ab558d2e489ecca696f79f72ce54b4805de0da (diff) | |
| download | bcm5719-llvm-191b24d3d27d83715f0241c551bab25722de39fb.tar.gz bcm5719-llvm-191b24d3d27d83715f0241c551bab25722de39fb.zip | |
revert r310985 which breaks for the following case:
struct string {
~string();
};
void f2();
void f1(int) { f2(); }
void run(int c) {
string body;
while (true) {
if (c)
f1(c);
else
f1(c);
}
}
Will recommit once the issue is fixed.
llvm-svn: 311864
Diffstat (limited to 'llvm/lib/Transforms/Utils')
| -rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 55897cc507b..1204a94a32a 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1336,8 +1336,6 @@ HoistTerminator: I2->replaceAllUsesWith(NT); NT->takeName(I1); } - NT->setDebugLoc(DILocation::getMergedLocation( - I1->getDebugLoc(), I2->getDebugLoc())); IRBuilder<NoFolder> Builder(NT); // Hoisting one of the terminators from our successor is a great thing. |
