maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert 326766 too, after r326862 the test fails and I don't know how to fix. 

llvm-svn: 326869
This commit is contained in:
Nico Weber 2018-03-07 03:00:25 +00:00
parent 4cbeeb1695
commit b2ecd46ae4
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/AST/ExprConstant.cpp
View File

@ -133,11 +133,7 @@ namespace {
E = E->IgnoreParens();
// If we're doing a variable assignment from e.g. malloc(N), there will
// probably be a cast of some kind. In exotic cases, we might also see a
// top-level ExprWithCleanups. Ignore them either way.
if (const auto *EC = dyn_cast<ExprWithCleanups>(E))
E = EC->getSubExpr()->IgnoreParens();
// probably be a cast of some kind. Ignore it.
if (const auto *Cast = dyn_cast<CastExpr>(E))
E = Cast->getSubExpr()->IgnoreParens();

12
clang/test/CodeGenCXX/alloc-size.cpp
View File

@ -70,15 +70,3 @@ int testIt() {
__builtin_object_size(dependent_calloc2<int, 9>(), 0);
}
} // namespace templated_alloc_size
struct D {
~D();
void *my_malloc(int N) __attribute__((alloc_size(2)));
};
// CHECK-LABEL: define i32 @_Z20callExprWithCleanupsv
int callExprWithCleanups() {
int *const p = (int *)D().my_malloc(3);
// CHECK: ret i32 3
return __builtin_object_size(p, 0);
}