Revert "Reapply "[IR] Move optional data in llvm::Function into a hungoff uselist""

[oota-llvm.git] / include / llvm / IR / Function.h

diff --git a/include/llvm/IR/Function.h b/include/llvm/IR/Function.h
index 2a983930bf4d1f91d2f55cf1e097ba458912c567..2843cf2cce35255f878ebca038c87c1d33bfbba0 100644 (file)
--- a/include/llvm/IR/Function.h
+++ b/include/llvm/IR/Function.h
@@ -64,7 +64,7 @@ private:
    * bit 0      : HasLazyArguments
    * bit 1      : HasPrefixData
    * bit 2      : HasPrologueData
-   * bit 3      : HasPersonalityFn
+   * bit 3      : [reserved]
    * bits 4-13  : CallingConvention
    * bits 14-15 : [reserved]
    */
@@ -110,7 +110,7 @@ private:
 public:
   static Function *Create(FunctionType *Ty, LinkageTypes Linkage,
                           const Twine &N = "", Module *M = nullptr) {
-    return new Function(Ty, Linkage, N, M);
+    return new(1) Function(Ty, Linkage, N, M);
   }
 
   ~Function() override;
@@ -118,6 +118,14 @@ public:
   /// \brief Provide fast operand accessors
   DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);
 
+  /// \brief Get the personality function associated with this function.
+  bool hasPersonalityFn() const { return getNumOperands() != 0; }
+  Constant *getPersonalityFn() const {
+    assert(hasPersonalityFn());
+    return cast<Constant>(Op<0>());
+  }
+  void setPersonalityFn(Constant *C);
+
   Type *getReturnType() const;           // Return the type of the ret val
   FunctionType *getFunctionType() const; // Return the FunctionType for me
 
@@ -517,30 +525,17 @@ public:
   size_t arg_size() const;
   bool arg_empty() const;
 
-  /// \brief Check whether this function has a personality function.
-  bool hasPersonalityFn() const {
-    return getSubclassDataFromValue() & (1<<3);
-  }
-
-  /// \brief Get the personality function associated with this function.
-  Constant *getPersonalityFn() const;
-  void setPersonalityFn(Constant *Fn);
-
-  /// \brief Check whether this function has prefix data.
   bool hasPrefixData() const {
     return getSubclassDataFromValue() & (1<<1);
   }
 
-  /// \brief Get the prefix data associated with this function.
   Constant *getPrefixData() const;
   void setPrefixData(Constant *PrefixData);
 
-  /// \brief Check whether this function has prologue data.
   bool hasPrologueData() const {
     return getSubclassDataFromValue() & (1<<2);
   }
 
-  /// \brief Get the prologue data associated with this function.
   Constant *getPrologueData() const;
   void setPrologueData(Constant *PrologueData);
 
@@ -635,15 +630,11 @@ public:
   DISubprogram *getSubprogram() const;
 
 private:
-  void allocHungoffUselist();
-  template<int Idx> void setHungoffOperand(Constant *C);
-
   // Shadow Value::setValueSubclassData with a private forwarding method so that
   // subclasses cannot accidentally use it.
   void setValueSubclassData(unsigned short D) {
     Value::setValueSubclassData(D);
   }
-  void setValueSubclassDataBit(unsigned Bit, bool On);
 
   bool hasMetadataHashEntry() const {
     return getGlobalObjectSubClassData() & HasMetadataHashEntryBit;
@@ -656,7 +647,7 @@ private:
 };
 
 template <>
-struct OperandTraits<Function> : public HungoffOperandTraits<3> {};
+struct OperandTraits<Function> : public OptionalOperandTraits<Function> {};
 
 DEFINE_TRANSPARENT_OPERAND_ACCESSORS(Function, Value)