jruby · Apr 2, 2016 · Apr 2, 2016 · Apr 2, 2016 · Apr 2, 2016 · Apr 2, 2016
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -224,7 +224,7 @@ public class Options {
 
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE = bool(TRUFFLE, "truffle.platform.safe", false, "Disallow any unsafe access to the platform, such as IO, processes and so on.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_PROCESSES = bool(TRUFFLE, "truffle.platform.safe.processes", false, "Treat any methods that deal with processes as safe.");
-    public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_EXIT = bool(TRUFFLE, "truffle.platform.safe.exit", false, "Treat exiting the VM as safe.");
+    public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_EXIT = bool(TRUFFLE, "truffle.platform.safe.exit", false, "Treat #exit! (hard exiting the VM) as safe.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_SAFE_PUTS = bool(TRUFFLE, "truffle.platform.safe_puts", true, "Treat Truffle::Primitive.safe_puts as safe.");
     public static final Option<Boolean> TRUFFLE_PLATFORM_USE_JAVA = bool(TRUFFLE, "truffle.platform.use_java", false, "Use a pure-Java platform, so no native POSIX.");
 

diff --git a/spec/ruby/command_line/fixtures/freeze_flag_across_files.rb b/spec/ruby/command_line/fixtures/freeze_flag_across_files.rb
@@ -0,0 +1,3 @@
+require_relative 'freeze_flag_required'
+
+p "abc".freeze.object_id == $second_literal_id
diff --git a/spec/ruby/command_line/fixtures/freeze_flag_across_files_diff_enc.rb b/spec/ruby/command_line/fixtures/freeze_flag_across_files_diff_enc.rb
@@ -0,0 +1,3 @@
+require_relative 'freeze_flag_required_diff_enc'
+
+p "abc".freeze.object_id != $second_literal_id
diff --git a/spec/ruby/command_line/fixtures/freeze_flag_one_literal.rb b/spec/ruby/command_line/fixtures/freeze_flag_one_literal.rb
@@ -0,0 +1,2 @@
+ids = Array.new(2) { "abc".freeze.object_id }
+p ids.first == ids.last
diff --git a/spec/ruby/command_line/fixtures/freeze_flag_required.rb b/spec/ruby/command_line/fixtures/freeze_flag_required.rb
@@ -0,0 +1 @@
+$second_literal_id = "abc".freeze.object_id
diff --git a/spec/ruby/command_line/fixtures/freeze_flag_required_diff_enc.rb b/spec/ruby/command_line/fixtures/freeze_flag_required_diff_enc.rb
diff --git a/spec/ruby/command_line/fixtures/freeze_flag_two_literals.rb b/spec/ruby/command_line/fixtures/freeze_flag_two_literals.rb
@@ -0,0 +1 @@
+p "abc".freeze.object_id == "abc".freeze.object_id
diff --git a/spec/ruby/command_line/frozen_strings_spec.rb b/spec/ruby/command_line/frozen_strings_spec.rb
@@ -0,0 +1,21 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe "The --enable-frozen-string-literal flag causes string literals to" do
+
+  it "produce the same object each time" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_one_literal.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
+
+  it "produce the same object for literals with the same content" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_two_literals.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
+
+  it "produce the same object for literals with the same content in different files" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_across_files.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
+
+  it "produce different objects for literals with the same content in different files if they have different encodings" do
+    ruby_exe(fixture(__FILE__, "freeze_flag_across_files_diff_enc.rb"), options: "--enable-frozen-string-literal").chomp.should == "true"
+  end
+
+end
diff --git a/spec/ruby/core/string/freeze_spec.rb b/spec/ruby/core/string/freeze_spec.rb
@@ -0,0 +1,14 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "String#freeze" do
+
+  it "produces the same object whenever called on an instance of a literal in the source" do
+    ids = Array.new(2) { "abc".freeze.object_id }
+    ids.first.should == ids.last
+  end
+
+  it "doesn't produce the same object for different instances of literals in the source" do
+    "abc".object_id.should_not == "abc".object_id
+  end
+
+end
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb b/spec/ruby/language/fixtures/freeze_magic_comment_across_files.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'freeze_magic_comment_required'
+
+p "abc".freeze.object_id == $second_literal_id
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb b/spec/ruby/language/fixtures/freeze_magic_comment_across_files_diff_enc.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'freeze_magic_comment_required_diff_enc'
+
+p "abc".freeze.object_id != $second_literal_id
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb b/spec/ruby/language/fixtures/freeze_magic_comment_across_files_no_comment.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'freeze_magic_comment_required_no_comment'
+
+p "abc".freeze.object_id != $second_literal_id
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb b/spec/ruby/language/fixtures/freeze_magic_comment_one_literal.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+ids = Array.new(2) { "abc".freeze.object_id }
+p ids.first == ids.last
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_required.rb b/spec/ruby/language/fixtures/freeze_magic_comment_required.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+$second_literal_id = "abc".freeze.object_id
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb b/spec/ruby/language/fixtures/freeze_magic_comment_required_diff_enc.rb
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb b/spec/ruby/language/fixtures/freeze_magic_comment_required_no_comment.rb
@@ -0,0 +1 @@
+$second_literal_id = "abc".freeze.object_id
diff --git a/spec/ruby/language/fixtures/freeze_magic_comment_two_literals.rb b/spec/ruby/language/fixtures/freeze_magic_comment_two_literals.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+p "abc".freeze.object_id == "abc".freeze.object_id
diff --git a/spec/ruby/language/string_spec.rb b/spec/ruby/language/string_spec.rb
@@ -284,6 +284,27 @@ def long_string_literals
   it "on multiple lines with newlines and backslash in between are concatenated together" do
     long_string_literals.should == "Beautiful is better than ugly.Explicit is better than implicit."
   end
+
+  it "with a magic frozen comment produce the same object each time" do
+    ruby_exe(fixture(__FILE__, "freeze_magic_comment_one_literal.rb")).chomp.should == "true"
+  end
+
+  it "with a magic frozen comment produce the same object for literals with the same content" do
+    ruby_exe(fixture(__FILE__, "freeze_magic_comment_two_literals.rb")).chomp.should == "true"
+  end
+
+  it "with a magic frozen comment produce the same object for literals with the same content in different files" do
+    ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files.rb")).chomp.should == "true"
+  end
+
+  it "with a magic frozen comment produce different objects for literals with the same content in different files if the other file doesn't have the comment" do
+    ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_no_comment.rb")).chomp.should == "true"
+  end
+
+  it "with a magic frozen comment produce different objects for literals with the same content in different files if they have different encodings" do
+    ruby_exe(fixture(__FILE__, "freeze_magic_comment_across_files_diff_enc.rb")).chomp.should == "true"
+  end
+
 end
 
 with_feature :encoding do

diff --git a/spec/truffle/tags/core/string/freeze_tags.txt b/spec/truffle/tags/core/string/freeze_tags.txt
@@ -0,0 +1 @@
+fails:String#freeze produces the same object whenever called on an instance of a literal in the source
diff --git a/spec/truffle/tags/language/string_tags.txt b/spec/truffle/tags/language/string_tags.txt
@@ -0,0 +1,6 @@
+fails:Ruby String literals with a magic frozen comment produce the same object each time
+slow:Ruby String literals with a magic frozen comment produce the same object each time
+fails:Ruby String literals with a magic frozen comment produce the same object for literals with the same content
+slow:Ruby String literals with a magic frozen comment produce the same object for literals with the same content
+fails:Ruby String literals with a magic frozen comment produce the same object for literals with the same content in different files
+slow:Ruby String literals with a magic frozen comment produce the same object for literals with the same content in different files
diff --git a/test/truffle/integration/safe.sh b/test/truffle/integration/safe.sh
@@ -5,11 +5,11 @@ function run {
 }
 
 function safe {
-  run "$@" || ( echo "$@" was not safe ; exit 1 )
+  run "$@" || { echo "$@" was not safe ; exit 1; }
 }
 
 function unsafe {
-  run "$@" && ( echo "$@" was not unsafe ; exit 1 )
+  run "$@" && { echo "$@" was not unsafe ; exit ; }
 }
 
 # Things that are alway safe
@@ -28,7 +28,6 @@ unsafe -Xtruffle.platform.safe_puts=false -e "Truffle::Primitive.safe_puts 'hell
 
 #unsafe -e "puts 'hello, world'"
 unsafe -e '`echo foo`'
-unsafe -e 'exit'
 unsafe -e 'exit!'
 
 # Check we can enable some unsafe operations if we want to
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		require_relative 'freeze_flag_required'

		p "abc".freeze.object_id == $second_literal_id
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		require_relative 'freeze_flag_required_diff_enc'

		p "abc".freeze.object_id != $second_literal_id
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ids = Array.new(2) { "abc".freeze.object_id }
		p ids.first == ids.last
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		p "abc".freeze.object_id == "abc".freeze.object_id
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# frozen_string_literal: true

		$second_literal_id = "abc".freeze.object_id
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:String#freeze produces the same object whenever called on an instance of a literal in the source