Author: hans
Date: Mon Jul 18 15:48:17 2016
New Revision: 275910
URL: http://llvm.org/viewvc/llvm-project?rev=275910&view=rev
Log:
Merging r275879:
------------------------------------------------------------------------
r275879 | rnk | 2016-07-18 11:53:50 -0700 (Mon, 18 Jul 2016) | 1 line
Fix -Wmicrosoft-enum-value in GVNHoist.cpp
------------------------------------------------------------------------
Modified:
llvm/branches/release_39/ (props changed)
llvm/branches/release_39/lib/Transforms/Scalar/GVNHoist.cpp
Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 18 15:48:17 2016
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275870,275898
+/llvm/trunk:155241,275870,275879,275898
Modified: llvm/branches/release_39/lib/Transforms/Scalar/GVNHoist.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/Transforms/Scalar/GVNHoist.cpp?rev=275910&r1=275909&r2=275910&view=diff
==============================================================================
--- llvm/branches/release_39/lib/Transforms/Scalar/GVNHoist.cpp (original)
+++ llvm/branches/release_39/lib/Transforms/Scalar/GVNHoist.cpp Mon Jul 18
15:48:17 2016
@@ -86,7 +86,7 @@ typedef DenseMap<std::pair<unsigned, uns
VNtoInsns;
// An invalid value number Used when inserting a single value number into
// VNtoInsns.
-enum { InvalidVN = ~2U };
+enum : unsigned { InvalidVN = ~2U };
// Records all scalar instructions candidate for code hoisting.
class InsnInfo {
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
