[llvm] 6120cb4 - [VPlan] Move test strs to variables, silence spurious C4129 (NFC).

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2020-03-31T13:18:15+01:00
New Revision: 6120cb42f7977290fac7a8ae1a7c06fc79beb5dc

URL: https://github.com/llvm/llvm-project/commit/6120cb42f7977290fac7a8ae1a7c06fc79beb5dc
DIFF: https://github.com/llvm/llvm-project/commit/6120cb42f7977290fac7a8ae1a7c06fc79beb5dc.diff

LOG: [VPlan] Move test strs to variables, silence spurious C4129 (NFC).

This is a speculative fix to silence the spurious C4129 warning that
some version of MSVC generate for the raw string literals in the changed
files.

Before disabling the warning (D76428), try a potential fix suggested in
the review.

Added: 
    

Modified: 
    llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
    llvm/unittests/Transforms/Vectorize/VPlanTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp b/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
index 7d18b07698d6..dfa3d0ee7332 100644
--- a/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
+++ b/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
@@ -94,7 +94,7 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) {
   Plan->addVPValue(&*F->arg_begin());
   std::string FullDump;
   raw_string_ostream(FullDump) << *Plan;
-  EXPECT_EQ(R"(digraph VPlan {
+  const char *ExpectedStr = R"(digraph VPlan {
 graph [labelloc=t, fontsize=30; label="Vectorization Plan"]
 node [shape=rect, fontname=Courier, fontsize=30]
 edge [fontname=Courier, fontsize=30]
@@ -125,8 +125,8 @@ compound=true
     ]
   }
 }
-)",
-            FullDump);
+)";
+  EXPECT_EQ(ExpectedStr, FullDump);
 
   LoopVectorizationLegality::InductionList Inductions;
   SmallPtrSet<Instruction *, 1> DeadInstructions;

diff  --git a/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp b/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
index ce0e0017fa85..73e01fade9a9 100644
--- a/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
+++ b/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
@@ -209,7 +209,7 @@ TEST(VPBasicBlockTest, print) {
   std::string FullDump;
   raw_string_ostream(FullDump) << Plan;
 
-  EXPECT_EQ(R"(digraph VPlan {
+  const char *ExpectedStr = R"(digraph VPlan {
 graph [labelloc=t, fontsize=30; label="Vectorization Plan"]
 node [shape=rect, fontname=Courier, fontsize=30]
 edge [fontname=Courier, fontsize=30]
@@ -227,8 +227,8 @@ compound=true
       "EMIT ret vp<%2>\l"
   ]
 }
-)",
-            FullDump);
+)";
+  EXPECT_EQ(ExpectedStr, FullDump);
 
   {
     std::string I3Dump;