# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1423679339 -3600
# Node ID 37bbcabf77443c3dfeebadeae0c34123eddfeed7
# Parent  45a24e9ba03b98c895b48e40faa6f34ceabf94f0
Truffle-DSL: move constant guard assertions after dynamic guards.

diff -r 45a24e9ba03b -r 37bbcabf7744 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Wed Feb 11 19:11:56 2015 +0100
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeGenFactory.java	Wed Feb 11 19:28:59 2015 +0100
@@ -1623,9 +1623,6 @@
         if (!cast.isEmpty()) {
             builder.tree(cast);
         }
-        if (!guardAssertions.isEmpty()) {
-            builder.tree(guardAssertions);
-        }
         boolean elseIf = !elseGuardExpressions.isEmpty();
         if (!methodGuards.isEmpty()) {
             builder.startIf(elseIf);
@@ -1636,6 +1633,9 @@
             builder.startElseBlock();
             ifCount++;
         }
+        if (!guardAssertions.isEmpty()) {
+            builder.tree(guardAssertions);
+        }
 
         boolean reachable = isReachableGroup(group, ifCount);
         if (reachable) {