From 625c59dad5aaf28ed5c5c03443d8be4864e6ddea Mon Sep 17 00:00:00 2001
From: Kyle Sanderson <kyle.leet@gmail.com>
Date: Tue, 31 Jul 2018 11:02:13 -0700
Subject: [PATCH] Disable de-virtualization in sh-tests for gcc-4.9+ (#53)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update AMBuilder
* Re-add gcc6 to .travis.yml
* right; 🐍
* where Travis-CI?
* fix whitespace problems w/ travis.yml
---
 .travis.yml                    | 9 +++++++++
 core/sourcehook/test/AMBuilder | 2 ++
 pushbuild.txt                  | 1 +
 3 files changed, 12 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 226a6729..ada0ce35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,15 @@ matrix:
           packages: ['clang-5.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
       env: ['MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"']
 
+    - os: linux
+      sudo: false
+      language: cpp
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-6', 'g++-6-multilib', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
+      env: ['MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"']
+
   allow_failures:
     - env: MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
     - env: MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
diff --git a/core/sourcehook/test/AMBuilder b/core/sourcehook/test/AMBuilder
index 9d6d7484..205daf26 100644
--- a/core/sourcehook/test/AMBuilder
+++ b/core/sourcehook/test/AMBuilder
@@ -7,6 +7,8 @@ for arch in MMS.archs:
   binary.compiler.cxxincludes += [
     os.path.join(builder.sourcePath, 'core', 'sourcehook'),
   ]
+  if binary.compiler.version >= 'gcc-4.9':
+    binary.compiler.cxxflags += ['-fno-devirtualize']
   if binary.compiler.version >= 'clang-2.9' or binary.compiler.version >= 'apple-clang-3.0':
     binary.compiler.cxxflags += ['-Wno-null-dereference']
 
diff --git a/pushbuild.txt b/pushbuild.txt
index 4598bf70..37220bf2 100644
--- a/pushbuild.txt
+++ b/pushbuild.txt
@@ -35,3 +35,4 @@ dvander is one million ladies tall today...
 Your tier1 tower is under attack..
 Christmas!
 is Skinny Pete any relation to Sneaky Pete???
+where Travis?