Merge pull request #1359 from kmod/metaserver_merge

Some minor improvements from the metaserver branch

Makefile

@@ -470,7 +470,8 @@ quick_check:
 
 Makefile.local:
 	echo "Creating default Makefile.local"
-	which ninja-build >/dev/null && echo "NINJA := ninja-build" >> Makefile.local
+	(which ninja-build >/dev/null && echo "NINJA := ninja-build" >> Makefile.local); true
+	touch Makefile.local
 
 llvm_up:
 	$(CPYTHON) $(TOOLS_DIR)/git_svn_gotorev.py $(LLVM_SRC) $(LLVM_REVISION) ./llvm_patches

from_cpython/Lib/threading.py

@@ -93,6 +93,8 @@ def setprofile(func):
     run() method is called.
 
     """
+    # This would otherwise fail at thread-creation time:
+    assert 0, "threading.setprofile not supported in Pyston yet"
     global _profile_hook
     _profile_hook = func
 
@@ -103,6 +105,8 @@ def settrace(func):
     method is called.
 
     """
+    # This would otherwise fail at thread-creation time:
+    assert 0, "threading.settrace not supported in Pyston yet"
     global _trace_hook
     _trace_hook = func
 

src/asm_writing/mc_writer.cpp

@@ -121,10 +121,6 @@ private:
     int pops_required;
 
     inline void _emitByte(uint8_t b) {
-        if (TRAP) {
-            printf(" %02x", b);
-            fflush(stdout);
-        }
         assert(addr < end_addr);
         *addr++ = b;
     }

src/core/options.cpp

@@ -36,7 +36,6 @@ bool CONTINUE_AFTER_FATAL = false;
 bool SHOW_DISASM = false;
 bool PROFILE = false;
 bool DUMPJIT = false;
-bool TRAP = false;
 bool USE_STRIPPED_STDLIB = true; // always true
 bool USE_REGALLOC_BASIC = false;
 bool PAUSE_AT_ABORT = false;

src/core/options.h

@@ -35,8 +35,8 @@ extern int OSR_THRESHOLD_T2, REOPT_THRESHOLD_T2;
 extern int SPECULATION_THRESHOLD;
 extern int MAX_OBJECT_CACHE_ENTRIES;
 
-extern bool SHOW_DISASM, FORCE_INTERPRETER, FORCE_OPTIMIZE, PROFILE, DUMPJIT, TRAP, USE_STRIPPED_STDLIB,
-    CONTINUE_AFTER_FATAL, ENABLE_INTERPRETER, ENABLE_BASELINEJIT, USE_REGALLOC_BASIC, PAUSE_AT_ABORT, ENABLE_TRACEBACKS,
+extern bool SHOW_DISASM, FORCE_INTERPRETER, FORCE_OPTIMIZE, PROFILE, DUMPJIT, USE_STRIPPED_STDLIB, CONTINUE_AFTER_FATAL,
+    ENABLE_INTERPRETER, ENABLE_BASELINEJIT, USE_REGALLOC_BASIC, PAUSE_AT_ABORT, ENABLE_TRACEBACKS,
     FORCE_LLVM_CAPI_CALLS, FORCE_LLVM_CAPI_THROWS;
 
 extern bool LOG_IC_ASSEMBLY, LOG_BJIT_ASSEMBLY;

src/jit.cpp

@@ -184,8 +184,6 @@ static void enableGdbSegfaultWatcher() {
 int handleArg(char code) {
     if (code == 'O')
         FORCE_OPTIMIZE = true;
-    else if (code == 't')
-        TRAP = true;
     else if (code == 'q')
         GLOBAL_VERBOSITY = 0;
     else if (code == 'v') {
@@ -207,7 +205,7 @@ int handleArg(char code) {
         PROFILE = true;
     } else if (code == 'j') {
         DUMPJIT = true;
-    } else if (code == 's') {
+    } else if (code == 'T') {
         Stats::setEnabled(true);
     } else if (code == 'S') {
         Py_NoSiteFlag = 1;
@@ -329,7 +327,7 @@ static int main(int argc, char** argv) noexcept {
 
         // Suppress getopt errors so we can throw them ourselves
         opterr = 0;
-        while ((code = getopt(argc, argv, "+:OqdIibpjtrsRSUvnxXEac:FuPTGm:")) != -1) {
+        while ((code = getopt(argc, argv, "+:OqdIibpjtrTRSUvnxXEac:FuPTGm:")) != -1) {
             if (code == 'c') {
                 assert(optarg);
                 command = optarg;

src/runtime/list.cpp

@@ -272,7 +272,8 @@ extern "C" BORROWED(PyObject*) PyList_GetItem(PyObject* op, Py_ssize_t i) noexce
     try {
         return listGetitemUnboxed(static_cast<BoxedList*>(op), i);
     } catch (ExcInfo e) {
-        abort();
+        setCAPIException(e);
+        return NULL;
     }
 }
 

tools/tester.py

@@ -231,7 +231,7 @@ def get_test_options(fn, check_stats, run_memcheck):
         opts.expected = "success"
 
     if opts.collect_stats:
-        opts.jit_args = ['-s'] + opts.jit_args
+        opts.jit_args = ['-T'] + opts.jit_args
 
     return opts