<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177703] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177703">177703</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 16:13:16 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify building with ASan
https://bugs.webkit.org/show_bug.cgi?id=139916
Reviewed by Mark Rowe.
.:
* Makefile.shared: Invoke set-webkit-configuration to store ASan choice as appropriate.
Tools:
* Scripts/set-webkit-configuration: Store ASan state into a new configuration file.
We could also update Configuration file format, but that's a little scary because
of how many places in code read it.
* Scripts/webkitdirs.pm:
(determineASanIsEnabled): Read it from ASan configuration file.
(argumentsForConfiguration): Added a FIXME.
(asanIsEnabled): A caching wrapper similar to what we have for other configuration options.
(XcodeOptions): Pass the options needed for ASan.
* asan/asan.xcconfig: Use the right toolchains. Made warnings fatal again, as there
no warnings to avoid. Removed explicit linking options, as -fsanitize=address does
that automatically.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkMakefileshared">trunk/Makefile.shared</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptssetwebkitconfiguration">trunk/Tools/Scripts/set-webkit-configuration</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsasanasanxcconfig">trunk/Tools/asan/asan.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (177702 => 177703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-12-24 00:13:03 UTC (rev 177702)
+++ trunk/ChangeLog 2014-12-24 00:13:16 UTC (rev 177703)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-12-23 Alexey Proskuryakov <ap@apple.com>
+
+ Simplify building with ASan
+ https://bugs.webkit.org/show_bug.cgi?id=139916
+
+ Reviewed by Mark Rowe.
+
+ * Makefile.shared: Invoke set-webkit-configuration to store ASan choice as appropriate.
+
</ins><span class="cx"> 2014-12-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.7.3 release.
</span></span></pre></div>
<a id="trunkMakefileshared"></a>
<div class="modfile"><h4>Modified: trunk/Makefile.shared (177702 => 177703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Makefile.shared 2014-12-24 00:13:03 UTC (rev 177702)
+++ trunk/Makefile.shared 2014-12-24 00:13:16 UTC (rev 177703)
</span><span class="lines">@@ -25,27 +25,40 @@
</span><span class="cx"> endif
</span><span class="cx"> endif
</span><span class="cx">
</span><ins>+ifeq ($(ASAN),YES)
+ASAN_OPTION=--asan
+else
+ifeq ($(ASAN),NO)
+ASAN_OPTION=--no-asan
+endif
+endif
+
</ins><span class="cx"> export DSYMUTIL_NUM_THREADS = $(shell sysctl -n hw.activecpu)
</span><span class="cx">
</span><del>-all:
</del><ins>+all: set_asan_configuration
</ins><span class="cx"> ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
</span><span class="cx">
</span><span class="cx"> debug d development dev develop: force
</span><del>- $(SCRIPTS_PATH)/set-webkit-configuration --debug
</del><ins>+ $(SCRIPTS_PATH)/set-webkit-configuration --debug $(ASAN_OPTION)
</ins><span class="cx"> ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
</span><span class="cx">
</span><span class="cx"> release r deployment dep deploy: force
</span><del>- $(SCRIPTS_PATH)/set-webkit-configuration --release
</del><ins>+ $(SCRIPTS_PATH)/set-webkit-configuration --release $(ASAN_OPTION)
</ins><span class="cx"> ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
</span><span class="cx">
</span><span class="cx"> analyze:
</span><del>- $(SCRIPTS_PATH)/set-webkit-configuration --release
</del><ins>+ $(SCRIPTS_PATH)/set-webkit-configuration --release $(ASAN_OPTION)
</ins><span class="cx"> ifndef PATH_TO_SCAN_BUILD
</span><span class="cx"> ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) RUN_CLANG_STATIC_ANALYZER=YES | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
</span><span class="cx"> else
</span><span class="cx"> ( $(SET_COLOR_DIAGNOSTICS_ARG); $(PATH_TO_SCAN_BUILD) xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
</span><span class="cx"> endif
</span><span class="cx">
</span><ins>+set_asan_configuration:
+ifneq (,$(ASAN_OPTION))
+ $(SCRIPTS_PATH)/set-webkit-configuration $(ASAN_OPTION)
+endif
+
</ins><span class="cx"> clean:
</span><span class="cx"> ( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177702 => 177703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-24 00:13:03 UTC (rev 177702)
+++ trunk/Tools/ChangeLog 2014-12-24 00:13:16 UTC (rev 177703)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-12-23 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Simplify building with ASan
+ https://bugs.webkit.org/show_bug.cgi?id=139916
+
+ Reviewed by Mark Rowe.
+
+ * Scripts/set-webkit-configuration: Store ASan state into a new configuration file.
+ We could also update Configuration file format, but that's a little scary because
+ of how many places in code read it.
+
+ * Scripts/webkitdirs.pm:
+ (determineASanIsEnabled): Read it from ASan configuration file.
+ (argumentsForConfiguration): Added a FIXME.
+ (asanIsEnabled): A caching wrapper similar to what we have for other configuration options.
+ (XcodeOptions): Pass the options needed for ASan.
+
+ * asan/asan.xcconfig: Use the right toolchains. Made warnings fatal again, as there
+ no warnings to avoid. Removed explicit linking options, as -fsanitize=address does
+ that automatically.
+
+2014-12-23 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> TestWebKitAPI build is broken when ASan is enabled
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139902
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptssetwebkitconfiguration"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/set-webkit-configuration (177702 => 177703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/set-webkit-configuration 2014-12-24 00:13:03 UTC (rev 177702)
+++ trunk/Tools/Scripts/set-webkit-configuration 2014-12-24 00:13:16 UTC (rev 177703)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> Usage: $programName [options]
</span><span class="cx"> --32-bit Set the default architecture to 32-bit
</span><span class="cx"> --64-bit Set the default architecture to 64-bit
</span><ins>+ --[no-]asan Enable or disable clang address sanitizer
</ins><span class="cx"> --debug Set the default configuration to debug
</span><span class="cx"> --release Set the default configuration to release
</span><span class="cx"> --reset Reset configurations
</span><span class="lines">@@ -43,6 +44,8 @@
</span><span class="cx">
</span><span class="cx"> my $configuration = passedConfiguration();
</span><span class="cx"> my $architecture = passedArchitecture();
</span><ins>+my $enableASAN = checkForArgumentAndRemoveFromARGV("--asan");
+my $disableASAN = checkForArgumentAndRemoveFromARGV("--no-asan");
</ins><span class="cx">
</span><span class="cx"> if (!$architecture) {
</span><span class="cx"> # Handle --64-bit explicitly here, as we don't want our other scripts to accept it
</span><span class="lines">@@ -61,10 +64,11 @@
</span><span class="cx"> if (checkForArgumentAndRemoveFromARGV("--reset")) {
</span><span class="cx"> unlink "$baseProductDir/Configuration";
</span><span class="cx"> unlink "$baseProductDir/Architecture";
</span><ins>+ unlink "$baseProductDir/ASan";
</ins><span class="cx"> exit 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (!$configuration && !$architecture) {
</del><ins>+if (!$configuration && !$architecture && !$enableASAN && !$disableASAN || ($enableASAN && $disableASAN)) {
</ins><span class="cx"> print STDERR $usage;
</span><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="lines">@@ -84,3 +88,11 @@
</span><span class="cx"> unlink "$baseProductDir/Architecture";
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+if ($enableASAN) {
+ open ASAN, ">", "$baseProductDir/ASan" or die;
+ print ASAN "YES";
+ close ASAN;
+} elsif ($disableASAN) {
+ unlink "$baseProductDir/ASan";
+}
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (177702 => 177703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-12-24 00:13:03 UTC (rev 177702)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-12-24 00:13:16 UTC (rev 177703)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> our @EXPORT_OK;
</span><span class="cx">
</span><span class="cx"> my $architecture;
</span><ins>+my $asanIsEnabled;
</ins><span class="cx"> my $numberOfCPUs;
</span><span class="cx"> my $maxCPULoad;
</span><span class="cx"> my $baseProductDir;
</span><span class="lines">@@ -347,6 +348,22 @@
</span><span class="cx"> $architecture = 'x86_64' if ($architecture =~ /amd64/ && isBSD());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub determineASanIsEnabled
+{
+ return if defined $asanIsEnabled;
+ determineBaseProductDir();
+
+ $asanIsEnabled = 0;
+ my $asanConfigurationValue;
+
+ if (open ASAN, "$baseProductDir/ASan") {
+ $asanConfigurationValue = <ASAN>;
+ close ASAN;
+ chomp $asanConfigurationValue;
+ $asanIsEnabled = 1 if $asanConfigurationValue eq "YES";
+ }
+}
+
</ins><span class="cx"> sub determineNumberOfCPUs
</span><span class="cx"> {
</span><span class="cx"> return if defined $numberOfCPUs;
</span><span class="lines">@@ -392,6 +409,8 @@
</span><span class="cx"> determineXcodeSDK();
</span><span class="cx">
</span><span class="cx"> my @args = ();
</span><ins>+ # FIXME: Is it necessary to pass --debug, --release, --32-bit or --64-bit?
+ # These are determined automatically from stored configuration.
</ins><span class="cx"> push(@args, '--debug') if ($configuration =~ "^Debug");
</span><span class="cx"> push(@args, '--release') if ($configuration =~ "^Release");
</span><span class="cx"> push(@args, '--device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
</span><span class="lines">@@ -588,6 +607,12 @@
</span><span class="cx"> return $configuration;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub asanIsEnabled()
+{
+ determineASanIsEnabled();
+ return $asanIsEnabled;
+}
+
</ins><span class="cx"> sub configurationForVisualStudio()
</span><span class="cx"> {
</span><span class="cx"> determineConfigurationForVisualStudio();
</span><span class="lines">@@ -624,12 +649,14 @@
</span><span class="cx"> determineBaseProductDir();
</span><span class="cx"> determineConfiguration();
</span><span class="cx"> determineArchitecture();
</span><ins>+ determineASanIsEnabled();
</ins><span class="cx"> determineXcodeSDK();
</span><span class="cx">
</span><span class="cx"> my @sdkOption = ($xcodeSDK ? "SDKROOT=$xcodeSDK" : ());
</span><span class="cx"> my @architectureOption = ($architecture ? "ARCHS=$architecture" : ());
</span><ins>+ my @asanOption = ($asanIsEnabled ? ("-xcconfig", sourceDir() . "/Tools/asan/asan.xcconfig", "ASAN_IGNORE=" . sourceDir() . "/Tools/asan/webkit-asan-ignore.txt") : ());
</ins><span class="cx">
</span><del>- return (@baseProductDirOption, "-configuration", $configuration, @architectureOption, @sdkOption, argumentsForXcode());
</del><ins>+ return (@baseProductDirOption, "-configuration", $configuration, @architectureOption, @sdkOption, @asanOption, argumentsForXcode());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub XcodeOptionString
</span></span></pre></div>
<a id="trunkToolsasanasanxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/asan/asan.xcconfig (177702 => 177703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/asan/asan.xcconfig 2014-12-24 00:13:03 UTC (rev 177702)
+++ trunk/Tools/asan/asan.xcconfig 2014-12-24 00:13:16 UTC (rev 177703)
</span><span class="lines">@@ -1,7 +1,12 @@
</span><del>-GCC_TREAT_WARNINGS_AS_ERRORS = NO;
</del><ins>+TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
+TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS_macosx_1080 = default;
+TOOLCHAINS_macosx_1090 = default;
+TOOLCHAINS_macosx_101000 = default;
+TOOLCHAINS_macosx_101100 = $(TOOLCHAINS);
</ins><span class="cx">
</span><del>-ASAN_OTHER_CFLAGS = -fsanitize=address -O1 -fsanitize-blacklist=$(ASAN_IGNORE) -Wno-error -fno-omit-frame-pointer -g -DUSE_SYSTEM_MALLOC=1;
</del><ins>+ASAN_OTHER_CFLAGS = -fsanitize=address -O1 -fsanitize-blacklist=$(ASAN_IGNORE) -fno-omit-frame-pointer -g -DUSE_SYSTEM_MALLOC=1;
</ins><span class="cx"> ASAN_OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CFLAGS);
</span><del>-ASAN_OTHER_LDFLAGS = -fsanitize=address $(ASAN_OTHER_LDFLAGS_$(PLATFORM_NAME));
-ASAN_OTHER_LDFLAGS_macosx = -lclang_rt.asan_osx_dynamic;
-ASAN_OTHER_LDFLAGS_iphonesimulator = -lclang_rt.asan_iossim_dynamic;
</del><ins>+ASAN_OTHER_LDFLAGS = -fsanitize=address;
+
+GCC_ENABLE_OBJC_GC = NO;
</ins></span></pre>
</div>
</div>
</body>
</html>