From b38c0b8f586d54c1b55260e652a5007fbf64c427 Mon Sep 17 00:00:00 2001 From: Hal Finkel Date: Tue, 2 Sep 2014 23:50:01 +0000 Subject: [PATCH] [CFLAA] And even more MSVC fixes Remove a couple more initializer lists and constexpr dependencies. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216998 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/CFLAliasAnalysis.cpp | 6 +++++- lib/Analysis/StratifiedSets.h | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Analysis/CFLAliasAnalysis.cpp b/lib/Analysis/CFLAliasAnalysis.cpp index e942529176d..05a472d761b 100644 --- a/lib/Analysis/CFLAliasAnalysis.cpp +++ b/lib/Analysis/CFLAliasAnalysis.cpp @@ -73,6 +73,9 @@ static Optional getTargetValue(Instruction *); // This notes that we should ignore those. static bool hasUsefulEdges(Instruction *); +const StratifiedIndex StratifiedLink::SetSentinel = + std::numeric_limits::max(); + namespace { // StratifiedInfo Attribute things. typedef unsigned StratifiedAttr; @@ -837,7 +840,8 @@ static void buildGraphFrom(CFLAliasAnalysis &Analysis, Function *Fn, auto From = findOrInsertNode(E.From); auto FlippedWeight = flipWeight(E.Weight); auto Attrs = E.AdditionalAttrs; - Graph.addEdge(From, To, {E.Weight, Attrs}, {FlippedWeight, Attrs}); + Graph.addEdge(From, To, std::make_pair(E.Weight, Attrs), + std::make_pair(FlippedWeight, Attrs)); } } } diff --git a/lib/Analysis/StratifiedSets.h b/lib/Analysis/StratifiedSets.h index 8a04bb302bf..d557bf7ae48 100644 --- a/lib/Analysis/StratifiedSets.h +++ b/lib/Analysis/StratifiedSets.h @@ -54,8 +54,7 @@ struct StratifiedLink { // Optional because Optional would // eat up a considerable amount of extra memory, after struct // padding/alignment is taken into account. - static const auto SetSentinel = - std::numeric_limits::max(); + static const StratifiedIndex SetSentinel; // \brief The index for the set "above" current StratifiedIndex Above; -- 2.11.0