Merge remote-tracking branch 'upstream/master'

parrot · Jun 6, 2012 · 37a0850 · 37a0850
2 parents a39094d + bb128c7
commit 37a0850
Show file tree

Hide file tree

Showing 8 changed files with 685 additions and 898 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -1450,10 +1450,10 @@ src/string/encoding/ucs4.c                                  []
 src/string/encoding/unicode.h                               []
 src/string/encoding/utf16.c                                 []
 src/string/encoding/utf8.c                                  []
-src/string/sprintf.c                                        []
 src/string/spf_private.h                                    []
 src/string/spf_render.c                                     []
 src/string/spf_vtable.c                                     []
+src/string/sprintf.c                                        []
 src/sub.c                                                   []
 src/utils.c                                                 []
 src/vtable.tbl                                              [devel]src
@@ -2181,7 +2181,7 @@ tools/dev/parrot_fuzzer.py                                  []
 tools/dev/parrot_shell.pl                                   []
 tools/dev/parrotbench.pl                                    []
 tools/dev/pbc_header.pl                                     []
-tools/dev/pbc_to_exe.pir                                    [devel]
+tools/dev/pbc_to_exe.winxed                                 []
 tools/dev/perlcritic-cage.conf                              []
 tools/dev/perlcritic.conf                                   []
 tools/dev/perltidy.conf                                     []

diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -904,6 +904,9 @@ $(PARROT) : $(FRPTWO_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
 
 
+$(DEV_TOOLS_DIR)/pbc_to_exe.pir: $(DEV_TOOLS_DIR)/pbc_to_exe.winxed $(PARROT) $(WINXED_LANG) winxed.pbc
+	$(PARROT) winxed.pbc -c --noan $(DEV_TOOLS_DIR)/pbc_to_exe.winxed
+
 $(PBC_TO_EXE) : $(DEV_TOOLS_DIR)/pbc_to_exe.pir $(LIBRARY_DIR)/config.pir $(PARROT) $(DYNEXT_DIR)/os$(LOAD_EXT) $(DYNEXT_DIR)/file$(LOAD_EXT)
 	$(PARROT) -o pbc_to_exe.pbc $(DEV_TOOLS_DIR)/pbc_to_exe.pir
 	$(PARROT) pbc_to_exe.pbc pbc_to_exe.pbc

diff --git a/examples/README.pod b/examples/README.pod
@@ -9,7 +9,7 @@ examples/README.pod - Readme file for the directory.
 =head1 DESCRIPTION
 
 The directory 'examples' provides examples of proper, and sometimes
-hillarious, programs for Parrot. Most of these examples are tested by test
+silly, programs for Parrot. Most of these examples are tested by test
 scripts in 't/examples'.
 
 =over 4

diff --git a/src/embed/api.c b/src/embed/api.c
@@ -550,6 +550,9 @@ Parrot_api_get_compiler(Parrot_PMC interp_pmc, ARGIN(Parrot_String type),
     ASSERT_ARGS(Parrot_api_get_compiler)
     EMBED_API_CALLIN(interp_pmc, interp)
     *compiler = Parrot_interp_get_compiler(interp, type);
+    if (PMC_IS_NULL(*compiler))
+        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+            "Cannot find compiler '%Ss'", type);
     EMBED_API_CALLOUT(interp_pmc, interp);
 }
 

diff --git a/src/exit.c b/src/exit.c
@@ -111,6 +111,7 @@ the interpreter is destroyed.
 */
 
 PARROT_COLD
+PARROT_NO_ADDRESS_SAFETY_ANALYSIS
 void
 Parrot_x_execute_on_exit_handlers(PARROT_INTERP, int status)
 {
@@ -134,6 +135,7 @@ Parrot_x_execute_on_exit_handlers(PARROT_INTERP, int status)
         node = next;
     }
 
+    /* It could be that the interpreter already is destroyed. See issue 765 */
     interp->exit_handler_list = NULL;
 
     /* Re-enable GC, which we will want if GC finalizes */

diff --git a/t/run/options.t b/t/run/options.t
@@ -116,7 +116,7 @@ like( $output, qr/maximum GC nursery size is 50%/,
 is( $exit, 0, '... and should not crash' );
 
 
-# Test --leak-test
+# Test --leak-test. See issue GH #765
 is( qx{$PARROT --leak-test "$first_pir_file"}, "first\n", '--leak-test' );
 
 # clean up temporary files