Adapt to upstream DeclareTag changes

Haiyang-Sun · Dec 7, 2019 · 51d1f0d · 51d1f0d
1 parent 1e10c94
commit 51d1f0d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/analysis/NodeProfAnalysis.java b/src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/analysis/NodeProfAnalysis.java
@@ -230,7 +230,8 @@ public void analysisReady(AnalysisFilterBase filter) {
                     ProfiledTagEnum.STATEMENT,
                     ProfiledTagEnum.EXPRESSION,
                     ProfiledTagEnum.CF_BRANCH,
-                    ProfiledTagEnum.ROOT
+                    ProfiledTagEnum.ROOT,
+                    ProfiledTagEnum.DECLARE
     };
 
     @TruffleBoundary

diff --git a/src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/handlers/DeclareEventHandler.java b/src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/handlers/DeclareEventHandler.java
@@ -18,6 +18,7 @@
 import com.oracle.truffle.api.instrumentation.EventContext;
 
 import ch.usi.inf.nodeprof.ProfiledTagEnum;
+import com.oracle.truffle.js.nodes.instrumentation.JSTags.DeclareTag;
 
 /**
  * Abstract event handler for literal events
@@ -28,8 +29,8 @@ public abstract class DeclareEventHandler extends BaseSingleTagEventHandler {
 
     public DeclareEventHandler(EventContext context) {
         super(context, ProfiledTagEnum.DECLARE);
-        this.declareType = (String) getAttribute("type");
-        this.declareName = (String) getAttribute("name");
+        this.declareType = (String) getAttribute(DeclareTag.TYPE);
+        this.declareName = (String) getAttribute(DeclareTag.NAME);
     }
 
     /**

diff --git a/src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/handlers/LiteralEventHandler.java b/src/ch.usi.inf.nodeprof/src/ch/usi/inf/nodeprof/handlers/LiteralEventHandler.java
@@ -45,7 +45,7 @@ public abstract class LiteralEventHandler extends BaseSingleTagEventHandler {
 
     public LiteralEventHandler(EventContext context) {
         super(context, ProfiledTagEnum.LITERAL);
-        this.literalType = (String) getAttribute("type");
+        this.literalType = (String) getAttribute(LiteralTag.TYPE);
     }
 
     /**