jruby · Jun 16, 2016 · Jun 16, 2016
diff --git a/spec/ruby/language/fixtures/dollar_zero.rb b/spec/ruby/language/fixtures/dollar_zero.rb
@@ -0,0 +1,6 @@
+puts $0
+puts __FILE__
+
+if $0 == __FILE__
+  print "OK"
+end
diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb
@@ -906,6 +906,13 @@ def obj.foo2; yield; end
     $0 = @orig_program_name
   end
 
+  it "is the path given as the main script and the same as __FILE__" do
+    script = "fixtures/dollar_zero.rb"
+    Dir.chdir(File.dirname(__FILE__)) do
+      ruby_exe(script).should == "#{script}\n#{script}\nOK"
+    end
+  end
+
   it "returns the program name" do
     $0 = "rbx"
     $0.should == "rbx"

diff --git a/spec/truffle/tags/language/predefined_tags.txt b/spec/truffle/tags/language/predefined_tags.txt
@@ -4,3 +4,4 @@ slow:The predefined global constant STDIN has the encodings set by #set_encoding
 slow:The predefined global constant STDOUT has the encodings set by #set_encoding
 slow:The predefined global constant ARGV contains Strings encoded in locale Encoding
 linux:Global variable $0 actually sets the program name
+slow:Global variable $0 is the path given as the main script and the same as __FILE__
diff --git a/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java b/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java
@@ -89,7 +89,7 @@ public RubyContext context() {
     public abstract static class RunJRubyRootNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
-        public Object runJRubyRootNode(VirtualFrame frame, @Cached("create()")IndirectCallNode callNode) {
+        public Object runJRubyRootNode(VirtualFrame frame, @Cached("create()") IndirectCallNode callNode) {
             coreLibrary().getGlobalVariables().put(
                     "$0",
                     StringOperations.createString(getContext(),
@@ -100,10 +100,6 @@ public Object runJRubyRootNode(VirtualFrame frame, @Cached("create()")IndirectCa
             final Source source;
 
             try {
-                if (!inputFile.equals("-e")) {
-                    inputFile = new File(inputFile).getCanonicalPath();
-                }
-
                 source = getContext().getSourceCache().getSource(inputFile);
             } catch (IOException e) {
                 throw new RuntimeException(e);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/SourceLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/SourceLoader.java
@@ -44,7 +44,6 @@ public Source load(String canonicalPath) throws IOException {
             if (!file.canRead()) {
                 throw new IOException("Can't read file " + canonicalPath);
             }
-            assert file.getCanonicalPath().equals(canonicalPath) : canonicalPath;
             return Source.fromFileName(canonicalPath);
         }
     }