[PATCH] D30396: [XRay][compiler-rt] Switch default XRay 'patch_premain' to false

[Dean Michael Berris via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL296445: [XRay][compiler-rt] Switch default XRay 'patch_premain' to false (authored by dberris).

Changed prior to commit:
  https://reviews.llvm.org/D30396?vs=89844&id=89981#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D30396

Files:
  compiler-rt/trunk/lib/xray/xray_flags.inc
  compiler-rt/trunk/test/xray/TestCases/Linux/argv0-log-file-name.cc
  compiler-rt/trunk/test/xray/TestCases/Linux/fixedsize-logging.cc
  compiler-rt/trunk/test/xray/TestCases/Linux/optional-inmemory-log.cc
  compiler-rt/trunk/test/xray/TestCases/Linux/pic_test.cc


Index: compiler-rt/trunk/test/xray/TestCases/Linux/optional-inmemory-log.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/optional-inmemory-log.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/optional-inmemory-log.cc
@@ -2,7 +2,7 @@
 // we turn it off via options.
 
 // RUN: %clangxx_xray -std=c++11 %s -o %t
-// RUN: XRAY_OPTIONS="verbosity=1 xray_naive_log=false xray_logfile_base=optional-inmemory-log.xray-" %run %t 2>&1 | FileCheck %s
+// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_naive_log=false xray_logfile_base=optional-inmemory-log.xray-" %run %t 2>&1 | FileCheck %s
 //
 // Make sure we clean out the logs in case there was a bug.
 //
Index: compiler-rt/trunk/test/xray/TestCases/Linux/fixedsize-logging.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/fixedsize-logging.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/fixedsize-logging.cc
@@ -1,7 +1,7 @@
 // Check to make sure that we have a log file with a fixed-size.
 
 // RUN: %clangxx_xray -std=c++11 %s -o %t
-// RUN: XRAY_OPTIONS="verbosity=1 xray_logfile_base=fixedsize-logging-" %run %t 2>&1 | FileCheck %s
+// RUN: XRAY_OPTIONS="patch_premain=true xray_naive_log=true verbosity=1 xray_logfile_base=fixedsize-logging-" %run %t 2>&1 | FileCheck %s
 //
 // After all that, clean up the output xray log.
 //
Index: compiler-rt/trunk/test/xray/TestCases/Linux/pic_test.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/pic_test.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/pic_test.cc
@@ -1,7 +1,7 @@
 // Test to check if we handle pic code properly.
 
 // RUN: %clangxx_xray -fxray-instrument -std=c++11 -fpic %s -o %t
-// RUN: XRAY_OPTIONS="verbosity=1 xray_logfile_base=pic-test-logging-" %run %t 2>&1 | FileCheck %s
+// RUN: XRAY_OPTIONS="patch_premain=true verbosity=1 xray_logfile_base=pic-test-logging-" %run %t 2>&1 | FileCheck %s
 // After all that, clean up the output xray log.
 //
 // RUN: rm pic-test-logging-*
Index: compiler-rt/trunk/test/xray/TestCases/Linux/argv0-log-file-name.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/argv0-log-file-name.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/argv0-log-file-name.cc
@@ -2,7 +2,7 @@
 // name.
 
 // RUN: %clangxx_xray -std=c++11 %s -o %t
-// RUN: %run %t > xray.log.file.name 2>&1
+// RUN: XRAY_OPTIONS="patch_premain=true xray_naive_log=true" %run %t > xray.log.file.name 2>&1
 // RUN: ls | FileCheck xray.log.file.name
 // RUN: rm xray-log.* xray.log.file.name
 
Index: compiler-rt/trunk/lib/xray/xray_flags.inc
===================================================================
--- compiler-rt/trunk/lib/xray/xray_flags.inc
+++ compiler-rt/trunk/lib/xray/xray_flags.inc
@@ -14,7 +14,7 @@
 #error "Define XRAY_FLAG prior to including this file!"
 #endif
 
-XRAY_FLAG(bool, patch_premain, true,
+XRAY_FLAG(bool, patch_premain, false,
           "Whether to patch instrumentation points before main.")
 XRAY_FLAG(bool, xray_naive_log, true,
           "Whether to install the naive log implementation.")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30396.89981.patch
Type: text/x-patch
Size: 3249 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170228/ff6c28aa/attachment.bin>