Minor cleanup

.travis.yml

@@ -35,7 +35,7 @@ addons:
     - ccache
     - clang-3.5
     - cmake
-    - g++-4.9
+    - g++-4.8
     - gdb
     - libbz2-dev
     - libgmp3-dev
@@ -51,7 +51,7 @@ addons:
 
 before_install:
   - if [ "$CC" = "clang" ]; then export CC="clang-3.5" CXX="clang++-3.5"; fi
-  - if [ "$CC" = "gcc" ]; then export CC="gcc-4.9" CXX="g++-4.9"; fi
+  - if [ "$CC" = "gcc" ]; then export CC="gcc-4.8" CXX="g++-4.8"; fi
   - $CXX --version
 
 install:

CMakeLists.txt

@@ -68,7 +68,6 @@ endif()
 set(CLANG_FLAGS "-Qunused-arguments -fcolor-diagnostics -Wno-profile-instr-unprofiled" CACHE STRING "Clang specific C and CXX flags")
 if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CLANG_FLAGS}")
-else()
 endif()
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLANG_FLAGS}")

src/runtime/objmodel.cpp

@@ -3789,7 +3789,7 @@ Box* runtimeCallInternal(Box* obj, CallRewriteArgs* rewrite_args, ArgPassSpec ar
     } else if (obj->cls == instancemethod_cls) {
         BoxedInstanceMethod* im = static_cast<BoxedInstanceMethod*>(obj);
 
-        RewriterVar* r_im_func;
+        RewriterVar* r_im_func = NULL;
         if (rewrite_args) {
             r_im_func = rewrite_args->obj->getAttr(offsetof(BoxedInstanceMethod, func), Location::any());
         }