From: Karl Schimpf <kschimpf@google.com>
Date: Tue, 26 Jan 2016 23:29:22 +0000 (-0800)
Subject: Fix template method InstARM32FourAddrFP to only have one definition.
X-Git-Tag: android-x86-7.1-r1~148^2~412
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8c5544b529f63c81e72dc4c70930dd07e5739d85;p=android-x86%2Fexternal-swiftshader.git

Fix template method InstARM32FourAddrFP to only have one definition.

Fixes case where IceTargetLowring.cpp and IceInstARM32.cpp generate
implementations for emitIAS().

BUG=None
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1638123002 .
---

diff --git a/src/IceInstARM32.cpp b/src/IceInstARM32.cpp
index a8d0efaa8..86edd1d76 100644
--- a/src/IceInstARM32.cpp
+++ b/src/IceInstARM32.cpp
@@ -227,6 +227,11 @@ void InstARM32FourAddrGPR<K>::emitIAS(const Cfg *Func) const {
 }
 
 template <InstARM32::InstKindARM32 K>
+void InstARM32FourAddrFP<K>::emitIAS(const Cfg *Func) const {
+  emitUsingTextFixup(Func);
+}
+
+template <InstARM32::InstKindARM32 K>
 void InstARM32ThreeAddrFP<K>::emitIAS(const Cfg *Func) const {
   emitUsingTextFixup(Func);
 }
diff --git a/src/IceInstARM32.h b/src/IceInstARM32.h
index eda1fe4b2..cca59d01c 100644
--- a/src/IceInstARM32.h
+++ b/src/IceInstARM32.h
@@ -835,7 +835,7 @@ public:
       return;
     emitFourAddrFP(Opcode, this, Func);
   }
-  void emitIAS(const Cfg *Func) const override { emitUsingTextFixup(Func); }
+  void emitIAS(const Cfg *Func) const override;
   void dump(const Cfg *Func) const override {
     if (!BuildDefs::dump())
       return;