diff options
| -rw-r--r-- | clang/lib/AST/ExprConstant.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/alloc-size.cpp | 12 |
2 files changed, 1 insertions, 17 deletions
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index c3e41658c29..45df133ad57 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -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(); diff --git a/clang/test/CodeGenCXX/alloc-size.cpp b/clang/test/CodeGenCXX/alloc-size.cpp index 5b8e1c5cf96..ac53ea8f8ea 100644 --- a/clang/test/CodeGenCXX/alloc-size.cpp +++ b/clang/test/CodeGenCXX/alloc-size.cpp @@ -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); -} |
