# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1335188972 -7200
# Node ID d0877209410da7e7b0cf92b06d011be91c95a708
# Parent  290b3025b66ff49ce0f3544dc3c9c8ec9fb2f6b6# Parent  558ea5229886f55ab07e81ee91c8a24ec1d70616
Merge.

diff -r 290b3025b66f -r d0877209410d graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Mon Apr 23 15:49:11 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Mon Apr 23 15:49:32 2012 +0200
@@ -846,7 +846,7 @@
             TTY.println("startBlock-ID: " + startBlock.getId());
 
             // bailout of if this occurs in product mode.
-            throw new GraalInternalError("liveIn set of first block must be empty");
+            throw new CiBailout("liveIn set of first block must be empty");
         }
     }