# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1427366347 -3600
# Node ID c38296febf23cedfe7390f431c79f377b8396394
# Parent  bbf53b35292e86771ffec751e40d435874a9d21c
don't process Word operations unless parsing a snippet or intrinsic

diff -r bbf53b35292e -r c38296febf23 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultGenericInvocationPlugin.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultGenericInvocationPlugin.java	Thu Mar 26 11:38:27 2015 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/DefaultGenericInvocationPlugin.java	Thu Mar 26 11:39:07 2015 +0100
@@ -50,7 +50,7 @@
     }
 
     public boolean apply(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
-        if (wordOperationPlugin.apply(b, method, args)) {
+        if (b.parsingReplacement() && wordOperationPlugin.apply(b, method, args)) {
             return true;
         } else if (b.parsingReplacement()) {
             NodeIntrinsic intrinsic = nodeIntrinsification.getIntrinsic(method);
diff -r bbf53b35292e -r c38296febf23 graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java	Thu Mar 26 11:38:27 2015 +0100
+++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/WordTypes.java	Thu Mar 26 11:39:07 2015 +0100
@@ -91,6 +91,7 @@
             assert wordImplType.isLinked();
             wordMethod = wordImplType.resolveConcreteMethod(targetMethod, callingContextType);
         }
+        assert wordMethod != null : targetMethod;
         assert wordMethod.getAnnotation(Operation.class) != null : wordMethod;
         return wordMethod;
     }