Author: nico Date: Tue Mar 6 19:00:25 2018 New Revision: 326869 URL: http://llvm.org/viewvc/llvm-project?rev=326869&view=rev Log: Revert 326766 too, after r326862 the test fails and I don't know how to fix.
Modified: cfe/trunk/lib/AST/ExprConstant.cpp cfe/trunk/test/CodeGenCXX/alloc-size.cpp Modified: cfe/trunk/lib/AST/ExprConstant.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=326869&r1=326868&r2=326869&view=diff ============================================================================== --- cfe/trunk/lib/AST/ExprConstant.cpp (original) +++ cfe/trunk/lib/AST/ExprConstant.cpp Tue Mar 6 19:00:25 2018 @@ -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(); Modified: cfe/trunk/test/CodeGenCXX/alloc-size.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/alloc-size.cpp?rev=326869&r1=326868&r2=326869&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/alloc-size.cpp (original) +++ cfe/trunk/test/CodeGenCXX/alloc-size.cpp Tue Mar 6 19:00:25 2018 @@ -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); -} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits