maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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.
This commit is contained in:
Florian Hahn 2020-03-31 13:15:10 +01:00
parent 2539b4ae47
commit 6120cb42f7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp
View File

@ -94,7 +94,7 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) {
Plan->addVPValue(&*F->arg_begin()); Plan->addVPValue(&*F->arg_begin());
std::string FullDump; std::string FullDump;
raw_string_ostream(FullDump) << *Plan; raw_string_ostream(FullDump) << *Plan;
EXPECT_EQ(R"(digraph VPlan { const char *ExpectedStr = R"(digraph VPlan {
graph [labelloc=t, fontsize=30; label="Vectorization Plan"] graph [labelloc=t, fontsize=30; label="Vectorization Plan"]
node [shape=rect, fontname=Courier, fontsize=30] node [shape=rect, fontname=Courier, fontsize=30]
edge [fontname=Courier, fontsize=30] edge [fontname=Courier, fontsize=30]
@ -125,8 +125,8 @@ compound=true
] ]
} }
} }
)", )";
FullDump); EXPECT_EQ(ExpectedStr, FullDump);
LoopVectorizationLegality::InductionList Inductions; LoopVectorizationLegality::InductionList Inductions;
SmallPtrSet<Instruction *, 1> DeadInstructions; SmallPtrSet<Instruction *, 1> DeadInstructions;

6
llvm/unittests/Transforms/Vectorize/VPlanTest.cpp
View File

@ -209,7 +209,7 @@ TEST(VPBasicBlockTest, print) {
std::string FullDump; std::string FullDump;
raw_string_ostream(FullDump) << Plan; raw_string_ostream(FullDump) << Plan;
EXPECT_EQ(R"(digraph VPlan { const char *ExpectedStr = R"(digraph VPlan {
graph [labelloc=t, fontsize=30; label="Vectorization Plan"] graph [labelloc=t, fontsize=30; label="Vectorization Plan"]
node [shape=rect, fontname=Courier, fontsize=30] node [shape=rect, fontname=Courier, fontsize=30]
edge [fontname=Courier, fontsize=30] edge [fontname=Courier, fontsize=30]
@ -227,8 +227,8 @@ compound=true
"EMIT ret vp<%2>\l" "EMIT ret vp<%2>\l"
] ]
} }
)", )";
FullDump); EXPECT_EQ(ExpectedStr, FullDump);
{ {
std::string I3Dump; std::string I3Dump;