Recommit r243824: -Wdeprecated-clean: Fix cases of violating the rule of 5 in ways...

This reverts commit r243888, recommitting r243824.

This broke the Windows build due to a difference in the C++ standard
library implementation. Using emplace/forward_as_tuple should ensure
there's no need to copy ValIDs.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243896 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 22e77b22892345ef918e6c1ff87c3af401053ad8..497b4972e68012fb564ca9526fdffbb9bbf5ce62 100644 (file)
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -13,6 +13,7 @@
 
 #include "LLParser.h"
 #include "llvm/ADT/SmallPtrSet.h"
 
 #include "LLParser.h"
 #include "llvm/ADT/SmallPtrSet.h"

+#include "llvm/ADT/STLExtras.h"

 #include "llvm/AsmParser/SlotMapping.h"
 #include "llvm/IR/AutoUpgrade.h"
 #include "llvm/IR/CallingConv.h"
 #include "llvm/AsmParser/SlotMapping.h"
 #include "llvm/IR/AutoUpgrade.h"
 #include "llvm/IR/CallingConv.h"


@@ -2458,9 +2459,10 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
         ParseToken(lltok::rbrace, "expected end of struct constant"))
       return true;
 
         ParseToken(lltok::rbrace, "expected end of struct constant"))
       return true;
 

-    ID.ConstantStructElts = new Constant*[Elts.size()];
+    ID.ConstantStructElts = make_unique<Constant *[]>(Elts.size());

     ID.UIntVal = Elts.size();
     ID.UIntVal = Elts.size();

-    memcpy(ID.ConstantStructElts, Elts.data(), Elts.size()*sizeof(Elts[0]));
+    memcpy(ID.ConstantStructElts.get(), Elts.data(),
+           Elts.size() * sizeof(Elts[0]));

     ID.Kind = ValID::t_ConstantStruct;
     return false;
   }
     ID.Kind = ValID::t_ConstantStruct;
     return false;
   }


@@ -2479,8 +2481,9 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
       return true;
 
     if (isPackedStruct) {
       return true;
 
     if (isPackedStruct) {

-      ID.ConstantStructElts = new Constant*[Elts.size()];
-      memcpy(ID.ConstantStructElts, Elts.data(), Elts.size()*sizeof(Elts[0]));
+      ID.ConstantStructElts = make_unique<Constant *[]>(Elts.size());
+      memcpy(ID.ConstantStructElts.get(), Elts.data(),
+             Elts.size() * sizeof(Elts[0]));

       ID.UIntVal = Elts.size();
       ID.Kind = ValID::t_PackedConstantStruct;
       return false;
       ID.UIntVal = Elts.size();
       ID.Kind = ValID::t_PackedConstantStruct;
       return false;


@@ -2606,9 +2609,9 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
     if (!F) {
       // Make a global variable as a placeholder for this reference.
       GlobalValue *&FwdRef =
     if (!F) {
       // Make a global variable as a placeholder for this reference.
       GlobalValue *&FwdRef =

-          ForwardRefBlockAddresses.insert(std::make_pair(
-                                              std::move(Fn),
-                                              std::map<ValID, GlobalValue *>()))
+          ForwardRefBlockAddresses.emplace(std::piecewise_construct,
+                                           std::forward_as_tuple(std::move(Fn)),
+                                           std::forward_as_tuple())

               .first->second.insert(std::make_pair(std::move(Label), nullptr))
               .first->second;
       if (!FwdRef)
               .first->second.insert(std::make_pair(std::move(Label), nullptr))
               .first->second;
       if (!FwdRef)


@@ -4085,8 +4088,8 @@ bool LLParser::ConvertValIDToValue(Type *Ty, ValID &ID, Value *&V,
           return Error(ID.Loc, "element " + Twine(i) +
                     " of struct initializer doesn't match struct element type");
 
           return Error(ID.Loc, "element " + Twine(i) +
                     " of struct initializer doesn't match struct element type");
 

-      V = ConstantStruct::get(ST, makeArrayRef(ID.ConstantStructElts,
-                                               ID.UIntVal));
+      V = ConstantStruct::get(
+          ST, makeArrayRef(ID.ConstantStructElts.get(), ID.UIntVal));

     } else
       return Error(ID.Loc, "constant expression type mismatch");
     return false;
     } else
       return Error(ID.Loc, "constant expression type mismatch");
     return false;

diff --git a/lib/AsmParser/LLParser.h b/lib/AsmParser/LLParser.h
index 0990e090b7c20d4733f2e4c9d8806b73f744a8f4..acbf6f9e5b821db26a329f7e9c7de86c52fc9ab8 100644 (file)
--- a/lib/AsmParser/LLParser.h
+++ b/lib/AsmParser/LLParser.h
@@ -55,22 +55,24 @@ namespace llvm {
       t_InlineAsm,                // Value in FTy/StrVal/StrVal2/UIntVal.
       t_ConstantStruct,           // Value in ConstantStructElts.
       t_PackedConstantStruct      // Value in ConstantStructElts.
       t_InlineAsm,                // Value in FTy/StrVal/StrVal2/UIntVal.
       t_ConstantStruct,           // Value in ConstantStructElts.
       t_PackedConstantStruct      // Value in ConstantStructElts.

-    } Kind;
+    } Kind = t_LocalID;

 
     LLLexer::LocTy Loc;
     unsigned UIntVal;
     FunctionType *FTy;
     std::string StrVal, StrVal2;
     APSInt APSIntVal;
 
     LLLexer::LocTy Loc;
     unsigned UIntVal;
     FunctionType *FTy;
     std::string StrVal, StrVal2;
     APSInt APSIntVal;

-    APFloat APFloatVal;
+    APFloat APFloatVal{0.0};

     Constant *ConstantVal;
     Constant *ConstantVal;

-    Constant **ConstantStructElts;
-
-    ValID() : Kind(t_LocalID), APFloatVal(0.0) {}
-    ~ValID() {
-      if (Kind == t_ConstantStruct || Kind == t_PackedConstantStruct)
-        delete [] ConstantStructElts;
-    }
+    std::unique_ptr<Constant *[]> ConstantStructElts;
+
+    ValID() = default;
+    ValID(ValID &&RHS)
+        : Kind(RHS.Kind), Loc(RHS.Loc), UIntVal(RHS.UIntVal), FTy(RHS.FTy),
+          StrVal(std::move(RHS.StrVal)), StrVal2(std::move(RHS.StrVal2)),
+          APSIntVal(std::move(RHS.APSIntVal)),
+          APFloatVal(std::move(RHS.APFloatVal)), ConstantVal(RHS.ConstantVal),
+          ConstantStructElts(std::move(RHS.ConstantStructElts)) {}

 
     bool operator<(const ValID &RHS) const {
       if (Kind == t_LocalID || Kind == t_GlobalID)
 
     bool operator<(const ValID &RHS) const {
       if (Kind == t_LocalID || Kind == t_GlobalID)