From af12c5a6ba8a8b059565e664ccbad43fa0f50868 Mon Sep 17 00:00:00 2001 From: Naomi Musgrave Date: Thu, 30 Jul 2015 17:59:48 +0000 Subject: [PATCH] Updated test regex and flags git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@243669 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGClass.cpp | 4 ++-- test/CodeGenCXX/sanitize-dtor-tail-call.cpp | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index a078beb9da..0426f6992a 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -1369,8 +1369,8 @@ static bool CanSkipVTablePointerInitialization(ASTContext &Context, // Generates function call for handling object poisoning, passing in // references to 'this' and its size as arguments. -// Disables tail call elimination, to save emitted callback from -// being optimized away. +// Disables tail call elimination, to prevent the current stack frame from +// disappearing from the stack trace. static void EmitDtorSanitizerCallback(CodeGenFunction &CGF, const CXXDestructorDecl *Dtor) { const ASTRecordLayout &Layout = diff --git a/test/CodeGenCXX/sanitize-dtor-tail-call.cpp b/test/CodeGenCXX/sanitize-dtor-tail-call.cpp index c82f074638..8c92c55f68 100644 --- a/test/CodeGenCXX/sanitize-dtor-tail-call.cpp +++ b/test/CodeGenCXX/sanitize-dtor-tail-call.cpp @@ -1,5 +1,5 @@ // Test -fsanitize-memory-use-after-dtor -// RUN: %clang_cc1 -O1 -fsanitize=memory -fsanitize-memory-use-after-dtor -std=c++11 -triple=x86_64-pc-linux -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -O1 -fsanitize=memory -fsanitize-memory-use-after-dtor -disable-llvm-optzns -std=c++11 -triple=x86_64-pc-linux -emit-llvm -o - %s | FileCheck %s struct Simple { int x_; @@ -14,7 +14,6 @@ struct Simple { Simple s; // Simple internal member is poisoned by compiler-generated dtor // CHECK-LABEL: define {{.*}}SimpleD2Ev -// CHECK: {{\s*}}call void @__sanitizer_dtor_callback -// CHECK-NOT: {{\s*}}call void @__sanitizer_dtor_callback -// CHECK-NOT: {{\s*}}tail call void @__sanitizer_dtor_callback +// CHECK: {{^ *}}call void @__sanitizer_dtor_callback +// CHECK-NOT: call void @__sanitizer_dtor_callback // CHECK: ret void -- 2.40.0