commit 624d665094752329eab37e466852f627571e700d
author Pirama Arumuga Nainar <pirama@google.com> Fri Mar 18 18:37:40 2016 -0700
committer Stephen Hines <srhines@google.com> Wed Apr 13 00:28:52 2016 -0700
tree e1ebabb20294e792ac7d6bdab8544f25c7b32eff
parent 4c65b43e7cecacf2ba7272b527ece9a579b6487a

Revert "Handle __fp16 natively if HalfArgsAndReturns langopt is set"

This reverts commit ba8a5652592440418dad2c5be62710b994c7fe11.

(cherry picked from commit 65ebe08e20e1e45557f00c6382743b3ea4792529)

Change-Id: Id793081c984af69c6b671ab30c94c3d11a55f684

lib/CodeGen/TargetInfo.cpp

diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index 9457b68..86adde4 100644
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -5001,7 +5001,7 @@
   // __fp16 gets passed as if it were an int or float, but with the top 16 bits
   // unspecified. This is not done for OpenCL as it handles the half type
   // natively, and does not need to interwork with AAPCS code.
-  if (Ty->isHalfType() && !getContext().getLangOpts().HalfArgsAndReturns) {
+  if (Ty->isHalfType() && !getContext().getLangOpts().OpenCL) {
     llvm::Type *ResType = IsEffectivelyAAPCS_VFP ?
       llvm::Type::getFloatTy(getVMContext()) :
       llvm::Type::getInt32Ty(getVMContext());
@@ -5197,7 +5197,7 @@
   // __fp16 gets returned as if it were an int or float, but with the top 16
   // bits unspecified. This is not done for OpenCL as it handles the half type
   // natively, and does not need to interwork with AAPCS code.
-  if (RetTy->isHalfType() && !getContext().getLangOpts().HalfArgsAndReturns) {
+  if (RetTy->isHalfType() && !getContext().getLangOpts().OpenCL) {
     llvm::Type *ResType = IsEffectivelyAAPCS_VFP ?
       llvm::Type::getFloatTy(getVMContext()) :
       llvm::Type::getInt32Ty(getVMContext());