[llvm] r298719 - [AMDGPU] Don't enforce constexpr, there are still old standard libraries around that don't have a constexpr std::pair.

[Benjamin Kramer via llvm-commits]

Author: d0k
Date: Fri Mar 24 12:53:06 2017
New Revision: 298719

URL: http://llvm.org/viewvc/llvm-project?rev=298719&view=rev
Log:
[AMDGPU] Don't enforce constexpr, there are still old standard libraries around that don't have a constexpr std::pair.

Modified:
    llvm/trunk/lib/Target/AMDGPU/SIMachineScheduler.cpp

Modified: llvm/trunk/lib/Target/AMDGPU/SIMachineScheduler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIMachineScheduler.cpp?rev=298719&r1=298718&r2=298719&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIMachineScheduler.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIMachineScheduler.cpp Fri Mar 24 12:53:06 2017
@@ -1809,8 +1809,8 @@ void SIScheduleDAGMI::schedule()
   // if VGPR usage is extremely high, try other good performing variants
   // which could lead to lower VGPR usage
   if (Best.MaxVGPRUsage > 180) {
-    static constexpr std::pair<SISchedulerBlockCreatorVariant,
-                               SISchedulerBlockSchedulerVariant>
+    static const std::pair<SISchedulerBlockCreatorVariant,
+                           SISchedulerBlockSchedulerVariant>
         Variants[] = {
       { LatenciesAlone, BlockRegUsageLatency },
 //      { LatenciesAlone, BlockRegUsage },
@@ -1830,8 +1830,8 @@ void SIScheduleDAGMI::schedule()
   // if VGPR usage is still extremely high, we may spill. Try other variants
   // which are less performing, but that could lead to lower VGPR usage.
   if (Best.MaxVGPRUsage > 200) {
-    static constexpr std::pair<SISchedulerBlockCreatorVariant,
-                               SISchedulerBlockSchedulerVariant>
+    static const std::pair<SISchedulerBlockCreatorVariant,
+                           SISchedulerBlockSchedulerVariant>
         Variants[] = {
 //      { LatenciesAlone, BlockRegUsageLatency },
       { LatenciesAlone, BlockRegUsage },