[llvm] r231436 - [objc-arc] Extract out MDNodes into a cache structure so the information can be passed around.

[Michael Gottesman]

Author: mgottesman
Date: Thu Mar  5 18:34:33 2015
New Revision: 231436

URL: http://llvm.org/viewvc/llvm-project?rev=231436&view=rev
Log:
[objc-arc] Extract out MDNodes into a cache structure so the information can be passed around.

Modified:
    llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.h
    llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp

Modified: llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.h?rev=231436&r1=231435&r2=231436&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.h (original)
+++ llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.h Thu Mar  5 18:34:33 2015
@@ -257,6 +257,18 @@ static inline bool IsObjCIdentifiedObjec
   return false;
 }
 
+/// A cache of MDKinds used by various ARC optimizations.
+struct ARCMDKindCache {
+  /// The Metadata Kind for clang.imprecise_release metadata.
+  unsigned ImpreciseReleaseMDKind;
+
+  /// The Metadata Kind for clang.arc.copy_on_escape metadata.
+  unsigned CopyOnEscapeMDKind;
+
+  /// The Metadata Kind for clang.arc.no_objc_arc_exceptions metadata.
+  unsigned NoObjCARCExceptionsMDKind;
+};
+
 } // end namespace objcarc
 } // end namespace llvm
 

Modified: llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp?rev=231436&r1=231435&r2=231436&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp (original)
+++ llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp Thu Mar  5 18:34:33 2015
@@ -402,12 +402,19 @@ void BBState::MergeSucc(const BBState &O
 }
 
 namespace {
+
   /// \brief The main ARC optimization pass.
   class ObjCARCOpt : public FunctionPass {
     bool Changed;
     ProvenanceAnalysis PA;
+
+    /// A cache of references to runtime entry point constants.
     ARCRuntimeEntryPoints EP;
 
+    /// A cache of MDKinds that can be passed into other functions to propagate
+    /// MDKind identifiers.
+    ARCMDKindCache MDKindCache;
+
     // This is used to track if a pointer is stored into an alloca.
     DenseSet<const Value *> MultiOwnersSet;
 
@@ -418,16 +425,6 @@ namespace {
     /// is in fact used in the current function.
     unsigned UsedInThisFunction;
 
-    /// The Metadata Kind for clang.imprecise_release metadata.
-    unsigned ImpreciseReleaseMDKind;
-
-    /// The Metadata Kind for clang.arc.copy_on_escape metadata.
-    unsigned CopyOnEscapeMDKind;
-
-    /// The Metadata Kind for clang.arc.no_objc_arc_exceptions metadata.
-    unsigned NoObjCARCExceptionsMDKind;
-
-
     bool OptimizeRetainRVCall(Function &F, Instruction *RetainRV);
     void OptimizeAutoreleaseRVCall(Function &F, Instruction *AutoreleaseRV,
                                    ARCInstKind &Class);
@@ -710,7 +707,8 @@ void ObjCARCOpt::OptimizeIndividualCalls
         Constant *Decl = EP.get(ARCRuntimeEntryPoints::EPT_Release);
         CallInst *NewCall = CallInst::Create(Decl, Call->getArgOperand(0), "",
                                              Call);
-        NewCall->setMetadata(ImpreciseReleaseMDKind, MDNode::get(C, None));
+        NewCall->setMetadata(MDKindCache.ImpreciseReleaseMDKind,
+                             MDNode::get(C, None));
 
         DEBUG(dbgs() << "Replacing autorelease{,RV}(x) with objc_release(x) "
               "since x is otherwise unused.\nOld: " << *Call << "\nNew: "
@@ -1059,7 +1057,8 @@ bool ObjCARCOpt::VisitInstructionBottomU
       NestingDetected = true;
     }
 
-    MDNode *ReleaseMetadata = Inst->getMetadata(ImpreciseReleaseMDKind);
+    MDNode *ReleaseMetadata =
+        Inst->getMetadata(MDKindCache.ImpreciseReleaseMDKind);
     Sequence NewSeq = ReleaseMetadata ? S_MovableRelease : S_Release;
     S.ResetSequenceProgress(NewSeq);
     S.SetReleaseMetadata(ReleaseMetadata);
@@ -1326,7 +1325,8 @@ ObjCARCOpt::VisitInstructionTopDown(Inst
 
     Sequence OldSeq = S.GetSeq();
 
-    MDNode *ReleaseMetadata = Inst->getMetadata(ImpreciseReleaseMDKind);
+    MDNode *ReleaseMetadata =
+        Inst->getMetadata(MDKindCache.ImpreciseReleaseMDKind);
 
     switch (OldSeq) {
     case S_Retain:
@@ -1554,8 +1554,7 @@ bool ObjCARCOpt::Visit(Function &F,
   SmallVector<BasicBlock *, 16> PostOrder;
   SmallVector<BasicBlock *, 16> ReverseCFGPostOrder;
   ComputePostOrders(F, PostOrder, ReverseCFGPostOrder,
-                    NoObjCARCExceptionsMDKind,
-                    BBStates);
+                    MDKindCache.NoObjCARCExceptionsMDKind, BBStates);
 
   // Use reverse-postorder on the reverse CFG for bottom-up.
   bool BottomUpNestingDetected = false;
@@ -1605,7 +1604,7 @@ void ObjCARCOpt::MoveCalls(Value *Arg, R
     CallInst *Call = CallInst::Create(Decl, MyArg, "", InsertPt);
     // Attach a clang.imprecise_release metadata tag, if appropriate.
     if (MDNode *M = ReleasesToMove.ReleaseMetadata)
-      Call->setMetadata(ImpreciseReleaseMDKind, M);
+      Call->setMetadata(MDKindCache.ImpreciseReleaseMDKind, M);
     Call->setDoesNotThrow();
     if (ReleasesToMove.IsTailCallRelease)
       Call->setTailCall();
@@ -2279,12 +2278,12 @@ bool ObjCARCOpt::doInitialization(Module
     return false;
 
   // Identify the imprecise release metadata kind.
-  ImpreciseReleaseMDKind =
-    M.getContext().getMDKindID("clang.imprecise_release");
-  CopyOnEscapeMDKind =
-    M.getContext().getMDKindID("clang.arc.copy_on_escape");
-  NoObjCARCExceptionsMDKind =
-    M.getContext().getMDKindID("clang.arc.no_objc_arc_exceptions");
+  MDKindCache.ImpreciseReleaseMDKind =
+      M.getContext().getMDKindID("clang.imprecise_release");
+  MDKindCache.CopyOnEscapeMDKind =
+      M.getContext().getMDKindID("clang.arc.copy_on_escape");
+  MDKindCache.NoObjCARCExceptionsMDKind =
+      M.getContext().getMDKindID("clang.arc.no_objc_arc_exceptions");
 
   // Intuitively, objc_retain and others are nocapture, however in practice
   // they are not, because they return their argument value. And objc_release