From 427215ce5ef200869b2ee6f62a48aa5733b375f3 Mon Sep 17 00:00:00 2001
From: Dean Michael Berris <dberris@google.com>
Date: Tue, 28 Feb 2017 08:10:01 +0000
Subject: [PATCH] [XRay][compiler-rt] Switch default XRay 'patch_premain' to
 false

Summary:
Currently, we assume that applications built with XRay would like to
have the instrumentation sleds patched before main starts. This patch
changes the default so that we do not patch the instrumentation sleds
before main. This default is more helpful for deploying applications in
environments where changing the current default is harder (i.e. on
remote machines, or work-pool-like systems).

This default (not to patch pre-main) makes it easier to selectively run
applications with XRay instrumentation enabled, than with the current
state.

Reviewers: echristo, timshen

Subscribers: mehdi_amini, llvm-commits

Differential Revision: https://reviews.llvm.org/D30396

llvm-svn: 296445
---
 compiler-rt/lib/xray/xray_flags.inc                            | 2 +-
 compiler-rt/test/xray/TestCases/Linux/argv0-log-file-name.cc   | 2 +-
 compiler-rt/test/xray/TestCases/Linux/fixedsize-logging.cc     | 2 +-
 compiler-rt/test/xray/TestCases/Linux/optional-inmemory-log.cc | 2 +-
 compiler-rt/test/xray/TestCases/Linux/pic_test.cc              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler-rt/lib/xray/xray_flags.inc b/compiler-rt/lib/xray/xray_flags.inc
index 2645ae121933b..7a16c414733e0 100644
--- a/compiler-rt/lib/xray/xray_flags.inc
+++ b/compiler-rt/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.")
diff --git a/compiler-rt/test/xray/TestCases/Linux/argv0-log-file-name.cc b/compiler-rt/test/xray/TestCases/Linux/argv0-log-file-name.cc
index 1765ce9b5ba1e..2960c57181e05 100644
--- a/compiler-rt/test/xray/TestCases/Linux/argv0-log-file-name.cc
+++ b/compiler-rt/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
 
diff --git a/compiler-rt/test/xray/TestCases/Linux/fixedsize-logging.cc b/compiler-rt/test/xray/TestCases/Linux/fixedsize-logging.cc
index 90e766876c546..eb32afe93d1ff 100644
--- a/compiler-rt/test/xray/TestCases/Linux/fixedsize-logging.cc
+++ b/compiler-rt/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.
 //
diff --git a/compiler-rt/test/xray/TestCases/Linux/optional-inmemory-log.cc b/compiler-rt/test/xray/TestCases/Linux/optional-inmemory-log.cc
index ef2c43f3be776..f459d5ab813f7 100644
--- a/compiler-rt/test/xray/TestCases/Linux/optional-inmemory-log.cc
+++ b/compiler-rt/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.
 //
diff --git a/compiler-rt/test/xray/TestCases/Linux/pic_test.cc b/compiler-rt/test/xray/TestCases/Linux/pic_test.cc
index 004f6da2f43d3..09c40b9e03177 100644
--- a/compiler-rt/test/xray/TestCases/Linux/pic_test.cc
+++ b/compiler-rt/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-*