Fix Thread::Backtrace::Location#absolute_path to return a canonical path

oracle · Jul 9, 2018 · aef7089 · aef7089
1 parent 266203e
commit aef7089
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/spec/tags/core/thread/backtrace/location/absolute_path_tags.txt b/spec/tags/core/thread/backtrace/location/absolute_path_tags.txt
diff --git a/src/main/java/org/truffleruby/core/thread/ThreadBacktraceLocationNodes.java b/src/main/java/org/truffleruby/core/thread/ThreadBacktraceLocationNodes.java
@@ -15,6 +15,9 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.SourceSection;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
@@ -25,6 +28,7 @@
 import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.language.backtrace.Activation;
 import org.truffleruby.language.backtrace.Backtrace;
+import org.truffleruby.language.control.JavaException;
 
 @CoreClass("Thread::Backtrace::Location")
 public class ThreadBacktraceLocationNodes {
@@ -50,7 +54,13 @@ public DynamicObject absolutePath(DynamicObject threadBacktraceLocation,
             if (path == null) {
                 return coreStrings().UNKNOWN.createInstance();
             } else {
-                return makeStringNode.fromRope(getContext().getPathToRopeCache().getCachedPath(path));
+                final String canonicalPath;
+                try {
+                    canonicalPath = new File(path).getCanonicalPath();
+                } catch (IOException e) {
+                    throw new JavaException(e);
+                }
+                return makeStringNode.fromRope(getContext().getPathToRopeCache().getCachedPath(canonicalPath));
             }
         }