diff options
author | George Burgess IV <george.burgess.iv@gmail.com> | 2016-08-25 01:05:08 +0000 |
---|---|---|
committer | George Burgess IV <george.burgess.iv@gmail.com> | 2016-08-25 01:05:08 +0000 |
commit | 381fc0ee3ce32583786aae1619b97cc28865015d (patch) | |
tree | 626593774835564c112e5edaa1f783a6d5cbb64b /llvm/lib/Analysis/AliasAnalysisSummary.cpp | |
parent | 1804a77b2a70dea81cc21b171febcc9df9cc1274 (diff) | |
download | bcm5719-llvm-381fc0ee3ce32583786aae1619b97cc28865015d.tar.gz bcm5719-llvm-381fc0ee3ce32583786aae1619b97cc28865015d.zip |
Make some LLVM_CONSTEXPR variables const. NFC.
This patch changes LLVM_CONSTEXPR variable declarations to const
variable declarations, since LLVM_CONSTEXPR expands to nothing if the
current compiler doesn't support constexpr. In all of the changed
cases, it looks like the code intended the variable to be const instead
of sometimes-constexpr sometimes-not.
llvm-svn: 279696
Diffstat (limited to 'llvm/lib/Analysis/AliasAnalysisSummary.cpp')
-rw-r--r-- | llvm/lib/Analysis/AliasAnalysisSummary.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/llvm/lib/Analysis/AliasAnalysisSummary.cpp b/llvm/lib/Analysis/AliasAnalysisSummary.cpp index 567405d0972..09a6b8217a0 100644 --- a/llvm/lib/Analysis/AliasAnalysisSummary.cpp +++ b/llvm/lib/Analysis/AliasAnalysisSummary.cpp @@ -7,25 +7,24 @@ namespace llvm { namespace cflaa { namespace { -LLVM_CONSTEXPR unsigned AttrEscapedIndex = 0; -LLVM_CONSTEXPR unsigned AttrUnknownIndex = 1; -LLVM_CONSTEXPR unsigned AttrGlobalIndex = 2; -LLVM_CONSTEXPR unsigned AttrCallerIndex = 3; -LLVM_CONSTEXPR unsigned AttrFirstArgIndex = 4; -LLVM_CONSTEXPR unsigned AttrLastArgIndex = NumAliasAttrs; -LLVM_CONSTEXPR unsigned AttrMaxNumArgs = AttrLastArgIndex - AttrFirstArgIndex; +const unsigned AttrEscapedIndex = 0; +const unsigned AttrUnknownIndex = 1; +const unsigned AttrGlobalIndex = 2; +const unsigned AttrCallerIndex = 3; +const unsigned AttrFirstArgIndex = 4; +const unsigned AttrLastArgIndex = NumAliasAttrs; +const unsigned AttrMaxNumArgs = AttrLastArgIndex - AttrFirstArgIndex; // NOTE: These aren't AliasAttrs because bitsets don't have a constexpr // ctor for some versions of MSVC that we support. We could maybe refactor, // but... using AliasAttr = unsigned; -LLVM_CONSTEXPR AliasAttr AttrNone = 0; -LLVM_CONSTEXPR AliasAttr AttrEscaped = 1 << AttrEscapedIndex; -LLVM_CONSTEXPR AliasAttr AttrUnknown = 1 << AttrUnknownIndex; -LLVM_CONSTEXPR AliasAttr AttrGlobal = 1 << AttrGlobalIndex; -LLVM_CONSTEXPR AliasAttr AttrCaller = 1 << AttrCallerIndex; -LLVM_CONSTEXPR AliasAttr ExternalAttrMask = - AttrEscaped | AttrUnknown | AttrGlobal; +const AliasAttr AttrNone = 0; +const AliasAttr AttrEscaped = 1 << AttrEscapedIndex; +const AliasAttr AttrUnknown = 1 << AttrUnknownIndex; +const AliasAttr AttrGlobal = 1 << AttrGlobalIndex; +const AliasAttr AttrCaller = 1 << AttrCallerIndex; +const AliasAttr ExternalAttrMask = AttrEscaped | AttrUnknown | AttrGlobal; } AliasAttrs getAttrNone() { return AttrNone; } |