From ad3a5b2df793db8373ade1cd01a7ad3651f817ad Mon Sep 17 00:00:00 2001
From: Filip Jeremic <fjeremic@ca.ibm.com>
Date: Mon, 26 Apr 2021 14:53:18 -0400
Subject: [PATCH] Deprecate code guarded by SUPPORT_DFP

---
 compiler/il/NodeUnions.hpp                |  5 -----
 compiler/optimizer/ValueNumberInfo.cpp    |  6 ------
 compiler/ras/Tree.cpp                     |  7 -------
 compiler/z/codegen/SystemLinkageLinux.cpp | 14 --------------
 compiler/z/codegen/SystemLinkagezOS.cpp   | 15 ---------------
 5 files changed, 47 deletions(-)

diff --git a/compiler/il/NodeUnions.hpp b/compiler/il/NodeUnions.hpp
index 017113e425d..39c6d9b498c 100644
--- a/compiler/il/NodeUnions.hpp
+++ b/compiler/il/NodeUnions.hpp
@@ -43,11 +43,6 @@ struct UnionedWithChildren
 
    union
       {
-#ifdef SUPPORT_DFP
-      // Used to hold long double constatants
-      uint32_t                _constData[4];
-#endif
-
       GlobalRegisterInfo                _globalRegisterInfo;
 
       // Offset to WCode literal pool for constants > 8 bytes
diff --git a/compiler/optimizer/ValueNumberInfo.cpp b/compiler/optimizer/ValueNumberInfo.cpp
index 30016066d20..efbe5b1bbbc 100644
--- a/compiler/optimizer/ValueNumberInfo.cpp
+++ b/compiler/optimizer/ValueNumberInfo.cpp
@@ -376,9 +376,6 @@ bool TR_ValueNumberInfo::congruentNodes(TR::Node * node, TR::Node * entryNode)
 #ifdef J9_PROJECT_SPECIFIC
           case TR::DecimalFloat: isSame = (node->getInt() == entryNode->getInt()); break;
           case TR::DecimalDouble: isSame = (node->getLongInt() == entryNode->getLongInt()); break;
-#ifdef SUPPORT_DFP
-          case TR::DecimalLongDouble: isSame = (node->getLongDouble() == entryNode->getLongDouble()); break;
-#endif
 #endif
           case TR::Address:isSame = (node->getAddress() == entryNode->getAddress()); break;
           default:
@@ -572,9 +569,6 @@ void TR_ValueNumberInfo::initializeNode(TR::Node *node, int32_t &negativeValueNu
 #ifdef J9_PROJECT_SPECIFIC
             case TR::DecimalFloat: isSame = (node->getInt() == entryNode->getInt()); break;
             case TR::DecimalDouble: isSame = (node->getLongInt() == entryNode->getLongInt()); break;
-#ifdef SUPPORT_DFP
-            case TR::DecimalLongDouble: isSame = (node->getLongDouble() == entryNode->getLongDouble()); break;
-#endif
 #endif
             case TR::Address:isSame = (node->getAddress() == entryNode->getAddress()); break;
             default:
diff --git a/compiler/ras/Tree.cpp b/compiler/ras/Tree.cpp
index 1cf83f7136a..1b4c08cad13 100644
--- a/compiler/ras/Tree.cpp
+++ b/compiler/ras/Tree.cpp
@@ -262,13 +262,6 @@ TR_Debug::printLoadConst(TR::Node *node, TR_PrettyPrinterString& output)
             output.append(" %g [" UINT64_PRINTF_FORMAT_HEX "]", node->getDouble(), node->getDouble(), node->getDoubleBits());
             }
          break;
-#ifdef SUPPORT_DFP
-      case TR::DecimalLongDouble:
-            {
-            output.append(" %llg", node->getLongDouble());
-            }
-         break;
-#endif
 #endif
       case TR::Address:
          if (node->getAddress() == 0)
diff --git a/compiler/z/codegen/SystemLinkageLinux.cpp b/compiler/z/codegen/SystemLinkageLinux.cpp
index 23fefaedcc4..69310b4a983 100644
--- a/compiler/z/codegen/SystemLinkageLinux.cpp
+++ b/compiler/z/codegen/SystemLinkageLinux.cpp
@@ -488,22 +488,8 @@ TR::S390zLinuxSystemLinkage::callNativeFunction(TR::Node * callNode,
       case TR::fcalli:
       case TR::dcall:
       case TR::dcalli:
-#if defined(SUPPORT_DFP) && defined(J9_PROJECT_SPECIFIC)
-      case TR::dfcall:
-      case TR::dfcalli:
-      case TR::ddcall:
-      case TR::ddcalli:
-#endif
          returnRegister = deps->searchPostConditionRegister(getFloatReturnRegister());
          break;
-#if defined(SUPPORT_DFP) && defined(J9_PROJECT_SPECIFIC)
-      case TR::decall:
-      case TR::decalli:
-         highReg = deps->searchPostConditionRegister(getLongDoubleReturnRegister0());
-         lowReg = deps->searchPostConditionRegister(getLongDoubleReturnRegister2());
-         returnRegister = cg()->allocateFPRegisterPair(lowReg, highReg);
-         break;
-#endif
       case TR::call:
       case TR::calli:
          returnRegister = NULL;
diff --git a/compiler/z/codegen/SystemLinkagezOS.cpp b/compiler/z/codegen/SystemLinkagezOS.cpp
index f17279bd3fc..08e77d0d22d 100644
--- a/compiler/z/codegen/SystemLinkagezOS.cpp
+++ b/compiler/z/codegen/SystemLinkagezOS.cpp
@@ -455,24 +455,9 @@ TR::S390zOSSystemLinkage::callNativeFunction(TR::Node * callNode, TR::RegisterDe
       case TR::dcalli:
       case TR::fcall:
       case TR::dcall:
-#if defined(SUPPORT_DFP) && defined(J9_PROJECT_SPECIFIC)
-      case TR::dfcalli:
-      case TR::ddcalli:
-      case TR::dfcall:
-      case TR::ddcall:
-#endif
          retReg = deps->searchPostConditionRegister(getFloatReturnRegister());
          returnRegister = retReg;
          break;
-#if defined(SUPPORT_DFP) && defined(J9_PROJECT_SPECIFIC)
-      case TR::decall:
-      case TR::decalli:
-         highReg = deps->searchPostConditionRegister(getLongDoubleReturnRegister0());
-         lowReg = deps->searchPostConditionRegister(getLongDoubleReturnRegister2());
-         retReg = codeGen->allocateFPRegisterPair(lowReg, highReg);
-         returnRegister = retReg;
-         break;
-#endif
       case TR::calli:
       case TR::call:
          retReg = NULL;