From 92b78bbc7f2ee919a2d09ed00fd35d1eb7f5f548 Mon Sep 17 00:00:00 2001 From: David Greene Date: Wed, 22 Jul 2009 22:32:19 +0000 Subject: Reorder if-else branches as suggested by Bill. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76808 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LiveInterval.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/CodeGen/LiveInterval.cpp') diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index 0428105..c8d3d43 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -800,15 +800,15 @@ void LiveInterval::ComputeJoinedWeight(const LiveInterval &Other) { // weight of the non-spilled interval. This can only happen with // iterative coalescers. - if (weight == HUGE_VALF && + if (Other.weight != HUGE_VALF) { + weight += Other.weight; + } + else if (weight == HUGE_VALF && !TargetRegisterInfo::isPhysicalRegister(reg)) { // Remove this assert if you have an iterative coalescer assert(0 && "Joining to spilled interval"); weight = Other.weight; } - else if (Other.weight != HUGE_VALF) { - weight += Other.weight; - } else { // Otherwise the weight stays the same // Remove this assert if you have an iterative coalescer -- cgit v1.1