summaryrefslogtreecommitdiffstats
path: root/components/nacl/loader
diff options
context:
space:
mode:
authormdempsky <mdempsky@chromium.org>2015-09-18 11:50:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-18 18:51:20 +0000
commit6d5ddf5cd94ed429df19496948062fe137e68116 (patch)
treea48bdc895285fbcebdb91dd26eaaa11966f29e5b /components/nacl/loader
parentb18afb6b328f7e1564b41992693864b2dc70c139 (diff)
downloadchromium_src-6d5ddf5cd94ed429df19496948062fe137e68116.zip
chromium_src-6d5ddf5cd94ed429df19496948062fe137e68116.tar.gz
chromium_src-6d5ddf5cd94ed429df19496948062fe137e68116.tar.bz2
nonsfi_sandbox: workaround new Clang optimizations in unit tests
The next version of Clang includes new optimizations that cause false positives for the Linux sandbox's "Invalid 64bit argument" detection logic. This CL works around those optimizations so we can upgrade to the next version of Clang, while we evaluate how best to deal with the questionable check in the sandbox code. BUG=532992 Review URL: https://codereview.chromium.org/1352643003 Cr-Commit-Position: refs/heads/master@{#349726}
Diffstat (limited to 'components/nacl/loader')
-rw-r--r--components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
index 102f5fa..71cc863 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
@@ -665,8 +665,9 @@ class TgkillDelegate : public sandbox::BPFTesterDelegate {
callback(pid_, tid_);
}
- int pid_;
- int tid_;
+ // These are longs as a temporary workaround for crbug.com/532992.
+ long pid_;
+ long tid_;
private:
DISALLOW_COPY_AND_ASSIGN(TgkillDelegate);