--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/FindContextNode.java	Fri Aug 07 20:00:39 2015 +0200
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/FindContextNode.java	Fri Aug 07 21:01:12 2015 +0200
@@ -29,13 +29,12 @@
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.nodes.Node;
 
-@SuppressWarnings("rawtypes")
 public final class FindContextNode<C> extends Node {
-    private final Class<TruffleLanguage> languageClass;
+    private final Class<? extends TruffleLanguage<C>> languageClass;
     @CompilerDirectives.CompilationFinal private C context;
     @CompilerDirectives.CompilationFinal private Assumption oneVM;
 
-    public FindContextNode(Class<TruffleLanguage> type) {
+    public FindContextNode(Class<? extends TruffleLanguage<C>> type) {
         this.languageClass = type;
     }
 
@@ -48,7 +47,7 @@
         return context = Accessor.findContext(languageClass);
     }
 
-    public Class<? extends TruffleLanguage> getLanguageClass() {
+    public Class<? extends TruffleLanguage<C>> getLanguageClass() {
         return languageClass;
     }
 }