parallel makes

Add a new config param, Server.FileSocket. When
Server.FileSocket
is set it will be used inplace of a network socket for the primary
server. This uses a new parameter to ServerOptions, m_useFileSocket,
to toggle between treating the address as a socket path or a network
address.

To initialize a socket connection thrift expects the socket file to not
exist. To support this the 'something nice' retry in startServer will
unlink an existing socket only if fuser claims it is unused.
Server.EvilShutdown enables unlinking the socket regardless of current
users.

Closes #1594

Reviewed By: @ptarjan

Differential Revision: D1135876

Pulled By: @sgolemon

.gitignore

@@ -1,10 +1,5 @@
 *.[oad]
 *.hhbc
-/bin*-g
-/bin*-O
-/bin/*.so
-/bin/hphp_options
-/bin/systemlib.php
 .mkdir
 hphp.log
 
@@ -31,18 +26,14 @@ hphp.log
 /hphp/runtime/tmp/run
 /hphp/runtime/tmp/run.sh
 /hphp/runtime/tmp/libtest.so
-/hphp/hphp_build_info.cpp
-/hphp/hphp_repo_schema.h
+/hphp/hphp-build-info.cpp
+/hphp/hphp-repo-schema.h
 
 /hphp/hhvm/gen
 /hphp/hhvm/hhvm
 
-/hphp/runtime/ext/*.ext_hhvm.cpp
-/hphp/runtime/ext/*.ext_hhvm.h
-/hphp/runtime/ext/*/*.ext_hhvm.cpp
-/hphp/runtime/ext/*/*.ext_hhvm.h
-/hphp/runtime/base/builtin_functions.cpp.ext_hhvm.cpp
-/hphp/runtime/base/builtin_functions.cpp.ext_hhvm.h
+*.ext_hhvm.cpp
+*.ext_hhvm.h
 /hphp/runtime/ext_hhvm/ext_hhvm_infotabs.cpp
 /hphp/runtime/ext_hhvm/ext_hhvm_infotabs.h
 
@@ -51,10 +42,6 @@ hphp.log
 /hphp/ffi/java/classes
 /hphp/ffi/java/hphp_ffi_java.h
 
-# Ignore all makefiles generated for fbcode's third-party repo
-/bin/*.mk
-!/bin/run.mk
-
 CMakeFiles
 CMakeCache.txt
 cmake_install.cmake
@@ -64,6 +51,8 @@ install_manifest.txt
 
 /hphp/TAGS
 
+/hphp/third_party/libzip/libzip.dylib
+
 # Generated makefiles
 /hphp/runtime/ext_hhvm/Makefile
 /hphp/test/Makefile

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "hphp/submodules/folly"]
+	path = hphp/submodules/folly
+	url = git://github.com/facebook/folly.git

.travis.yml

@@ -1,13 +1,48 @@
 language: cpp
+
 compiler:
   - gcc
-before_script: 
-  - ./configure_ubuntu_12.04.sh
-# for some tests  
-  - sudo locale-gen de_DE && sudo locale-gen zh_CN.utf8 && sudo locale-gen fr_FR
-  - HPHP_HOME=`pwd` make -j 8
-  
-script: hphp/hhvm/hhvm hphp/test/run quick slow zend
+
+before_script:
+  - time TRAVIS=1 ./configure_ubuntu_12.04.sh
+# for some tests
+  - time sudo locale-gen de_DE && sudo locale-gen zh_CN.utf8 && sudo locale-gen fr_FR
+  - time HPHP_HOME=`pwd` make -j 6
+  - cd hphp/test/zend/good/ext/curl/tests/responder && ../../../../../../../hhvm/hhvm -m server -p 8444 &
+# mysql configuration for unit-tests
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS hhvm;'
+  - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=hhvm"
+  - export PDO_MYSQL_TEST_USER="travis"
+  - export PDO_MYSQL_TEST_PASS=""
+
+# The larger test suites (slow, zend) take longer than 50 miuntes to run. Since
+# we have no way to change the timeout, we subdivide the jit/interp repo/normal
+# matrix and then further split the large suites using an experimental cut
+# which divides the number of tests in each sub-run roughly in two.
+env:
+  - TEST_RUN_MODE="-m jit quick"
+  - TEST_RUN_MODE="-m jit slow -I /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m jit slow -E /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m jit zend -I /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+  - TEST_RUN_MODE="-m jit zend -E /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/'
+  - TEST_RUN_MODE="-m jit -r quick"
+  - TEST_RUN_MODE="-m jit -r slow -I /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m jit -r slow -E /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m jit -r zend -I /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+  - TEST_RUN_MODE="-m jit -r zend -E /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+  - TEST_RUN_MODE="-m interp quick"
+  - TEST_RUN_MODE="-m interp slow -I /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m interp slow -E /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m interp zend -I /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+  - TEST_RUN_MODE="-m interp zend -E /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+  - TEST_RUN_MODE="-m interp -r quick"
+  - TEST_RUN_MODE="-m interp -r slow -I /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m interp -r slow -E /^hphp\/test\/slow\/[a-df-nw-x].*/"
+  - TEST_RUN_MODE="-m interp -r zend -I /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+  - TEST_RUN_MODE="-m interp -r zend -E /^hphp\/test\/zend\/good\/(ext\/[a-ru-zA-Z0-9]|[Z]).*/"
+
+script: time PHP_CURL_HTTP_REMOTE_SERVER="http://localhost:8444" hphp/hhvm/hhvm hphp/test/run $TEST_RUN_MODE
 
 notifications:
+  email: false
   irc: "chat.freenode.net#hhvm"

CMake/ExtZendCompat.cmake

@@ -0,0 +1,61 @@
+option(ENABLE_ZEND_COMPAT "Enable Zend source compatibility (beta)" OFF)
+
+set(ZEND_COMPAT_PROJECTS)
+set(ZEND_COMPAT_BUILD_DIRS)
+set(ZEND_COMPAT_EXCLUDE_IDLS)
+set(ZEND_COMPAT_LINK_LIBRARIES)
+
+# Look for projects
+set(EZC_DIR "${HPHP_HOME}/hphp/runtime/ext_zend_compat/")
+file(GLOB ezc_projects RELATIVE ${EZC_DIR} "${EZC_DIR}/*")
+foreach(ezc_project ${ezc_projects})
+	get_filename_component(ezc_name ${ezc_project} NAME)
+	if ((NOT ${ezc_name} STREQUAL "php-src") AND (IS_DIRECTORY "${EZC_DIR}/${ezc_name}"))
+		list(APPEND ZEND_COMPAT_PROJECTS ${ezc_name})
+	endif()
+endforeach()
+
+if (ENABLE_ZEND_COMPAT)
+	foreach(ezc_project ${ZEND_COMPAT_PROJECTS})
+		if (${ezc_project} STREQUAL "yaml")
+			find_package(LibYaml)
+			if (LibYaml_INCLUDE_DIRS)
+				list(APPEND ZEND_COMPAT_BUILD_DIRS "${EZC_DIR}/yaml")
+				include_directories(${LibYaml_INCLUDE_DIRS})
+				list(APPEND ZEND_COMPAT_LINK_LIBRARIES ${LibYaml_LIBRARIES})
+			else()
+				list(APPEND ZEND_COMPAT_EXCLUDE_IDLS "yaml.idl.json")
+			endif()
+		elseif (${ezc_project} STREQUAL "mongo")
+			include_directories("${EZC_DIR}/mongo/mcon")
+			list(APPEND ZEND_COMPAT_BUILD_DIRS "${EZC_DIR}/mongo")
+		else()
+			list(APPEND ZEND_COMPAT_BUILD_DIRS "${EZC_DIR}/${ezc_project}")
+		endif()
+	endforeach()
+
+	if (ZEND_COMPAT_BUILD_DIRS)
+		list(APPEND ZEND_COMPAT_BUILD_DIRS "${EZC_DIR}/php-src")
+		include_directories("${EZC_DIR}/php-src")
+		include_directories("${EZC_DIR}/php-src/main")
+		include_directories("${EZC_DIR}/php-src/Zend")
+		include_directories("${EZC_DIR}/php-src/TSRM")
+	endif()
+else()
+	foreach(ezc_project ${ZEND_COMPAT_PROJECTS})
+		list(APPEND ZEND_COMPAT_EXCLUDE_IDLS "${ezc_project}.idl.json")
+	endforeach()
+endif()
+
+# This is really ugly, but cmake's list(FIND)
+# doesn't entirely work the way it should
+macro(ZEND_COMPAT_STRIP_IDLS IDLS)
+	foreach(idl ${${IDLS}})
+		get_filename_component(idl_name ${idl} NAME)
+		foreach(f ${ARGV})
+			if (${idl_name} STREQUAL ${f})
+				list(REMOVE_ITEM ${IDLS} ${idl})
+			endif()
+		endforeach()
+	endforeach()
+endmacro()

CMake/FindEditline.cmake

@@ -0,0 +1,13 @@
+if (EDITLINE_LIBRARIES AND EDITLINE_INCLUDE_DIRS)
+  set (Editline_FIND_QUIETLY TRUE)
+endif (EDITLINE_LIBRARIES AND EDITLINE_INCLUDE_DIRS)
+
+find_path(EDITLINE_INCLUDE_DIRS NAMES editline/readline.h)
+find_library(EDITLINE_LIBRARIES NAMES edit)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Editline DEFAULT_MSG
+    EDITLINE_LIBRARIES
+    EDITLINE_INCLUDE_DIRS)
+
+mark_as_advanced(EDITLINE_INCLUDE_DIRS EDITLINE_LIBRARIES)

CMake/FindFreetype.cmake

@@ -0,0 +1,16 @@
+
+find_package(PkgConfig)
+pkg_check_modules(PC_FREETYPE QUIET freetype2)
+
+find_path(FREETYPE_INCLUDE_DIRS NAMES freetype/config/ftheader.h
+          HINTS ${PC_FREETYPE_INCLUDEDIR} ${PC_FREETYPE_INCLUDE_DIRS}
+          PATH_SUFFIXES freetype2)
+
+find_library(FREETYPE_LIBRARIES NAMES freetype)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG
+    FREETYPE_LIBRARIES
+    FREETYPE_INCLUDE_DIRS)
+
+mark_as_advanced(FREETYPE_INCLUDE_DIRS FREETYPE_LIBRARIES)

CMake/FindGD.cmake

@@ -1,121 +0,0 @@
-# - Find GD
-# Find the native GD includes and library
-# This module defines
-#  GD_INCLUDE_DIR, where to find gd.h, etc.
-#  GD_LIBRARIES, the libraries needed to use GD.
-#  GD_FOUND, If false, do not try to use GD.
-# also defined, but not for general use are
-#  GD_LIBRARY, where to find the GD library.
-#  GD_SUPPORTS_PNG, GD_SUPPORTS_JPEG, GD_SUPPORTS_GIF, test
-#  support for image formats in GD.
-
-FIND_PATH(GD_INCLUDE_DIR gd.h
-/usr/local/include
-/usr/include
-)
-
-if(WIN32 AND NOT CYGWIN)
-  SET(GD_NAMES ${GD_NAMES} bgd)
-else(WIN32)
-  SET(GD_NAMES ${GD_NAMES} gd)
-endif(WIN32 AND NOT CYGWIN)
-
-FIND_LIBRARY(GD_LIBRARY
-  NAMES ${GD_NAMES}
-  PATHS /usr/lib64 /usr/lib /usr/local/lib
-  )
-
-IF (GD_LIBRARY AND GD_INCLUDE_DIR)
-    SET(GD_LIBRARIES ${GD_LIBRARY})
-    SET(GD_FOUND "YES")
-ELSE (GD_LIBRARY AND GD_INCLUDE_DIR)
-  SET(GD_FOUND "NO")
-ENDIF (GD_LIBRARY AND GD_INCLUDE_DIR)
-
-IF (GD_FOUND)
-	IF (WIN32 AND NOT CYGWIN)
-		SET(GD_SUPPORTS_PNG ON)
-		SET(GD_SUPPORTS_JPEG ON)
-		SET(GD_SUPPORTS_GIF ON)
-		get_filename_component(GD_LIBRARY_DIR ${GD_LIBRARY} PATH)
-	ELSE (WIN32 AND NOT CYGWIN)
-		INCLUDE(CheckLibraryExists)
-		GET_FILENAME_COMPONENT(GD_LIB_PATH ${GD_LIBRARY} PATH)
-		GET_FILENAME_COMPONENT(GD_LIB ${GD_LIBRARY} NAME)
-
-		CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImagePng" "${GD_LIB_PATH}" GD_SUPPORTS_PNG)
-		IF (GD_SUPPORTS_PNG)
-			find_package(PNG)
-			IF (PNG_FOUND)
-				SET(GD_LIBRARIES ${GD_LIBRARIES} ${PNG_LIBRARIES})
-			SET(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
-			ELSE (PNG_FOUND)
-				SET(GD_SUPPORTS_PNG "NO")
-			ENDIF (PNG_FOUND)
-		ENDIF (GD_SUPPORTS_PNG)
-
-		CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageJpeg" "${GD_LIB_PATH}" GD_SUPPORTS_JPEG)
-		IF (GD_SUPPORTS_JPEG)
-			find_package(JPEG)
-			IF (JPEG_FOUND)
-				SET(GD_LIBRARIES ${GD_LIBRARIES} ${JPEG_LIBRARIES})
-				SET(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
-			ELSE (JPEG_FOUND)
-				SET(GD_SUPPORTS_JPEG "NO")
-			ENDIF (JPEG_FOUND)
-		ENDIF (GD_SUPPORTS_JPEG)
-
-		CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageGif" "${GD_LIB_PATH}" GD_SUPPORTS_GIF)
-
-		# Trim the list of include directories
-		SET(GDINCTRIM)
-		FOREACH(GD_DIR ${GD_INCLUDE_DIR})
-			SET(GD_TMP_FOUND OFF)
-			FOREACH(GD_TRIMMED ${GDINCTRIM})
-				IF ("${GD_DIR}" STREQUAL "${GD_TRIMMED}")
-				SET(GD_TMP_FOUND ON)
-				ENDIF ("${GD_DIR}" STREQUAL "${GD_TRIMMED}")
-			ENDFOREACH(GD_TRIMMED ${GDINCTRIM})
-			IF (NOT GD_TMP_FOUND)
-				SET(GDINCTRIM "${GDINCTRIM}" "${GD_DIR}")
-			ENDIF (NOT GD_TMP_FOUND)
-		ENDFOREACH(GD_DIR ${GD_INCLUDE_DIR})
-		SET(GD_INCLUDE_DIR ${GDINCTRIM})
-
-		SET(GD_LIBRARY_DIR)
-
-		# Generate trimmed list of library directories and list of libraries
-		FOREACH(GD_LIB ${GD_LIBRARIES})
-			GET_FILENAME_COMPONENT(GD_NEXTLIBDIR ${GD_LIB} PATH)
-			SET(GD_TMP_FOUND OFF)
-			FOREACH(GD_LIBDIR ${GD_LIBRARY_DIR})
-				IF ("${GD_NEXTLIBDIR}" STREQUAL "${GD_LIBDIR}")
-					SET(GD_TMP_FOUND ON)
-				ENDIF ("${GD_NEXTLIBDIR}" STREQUAL "${GD_LIBDIR}")
-			ENDFOREACH(GD_LIBDIR ${GD_LIBRARIES})
-			IF (NOT GD_TMP_FOUND)
-				SET(GD_LIBRARY_DIR "${GD_LIBRARY_DIR}" "${GD_NEXTLIBDIR}")
-			ENDIF (NOT GD_TMP_FOUND)
-		ENDFOREACH(GD_LIB ${GD_LIBRARIES})
-	ENDIF (WIN32 AND NOT CYGWIN)
-ENDIF (GD_FOUND)
-
-IF (GD_FOUND)
-   IF (NOT GD_FIND_QUIETLY)
-      MESSAGE(STATUS "Found GD: ${GD_LIBRARY}")
-   ENDIF (NOT GD_FIND_QUIETLY)
-ELSE (GD_FOUND)
-   IF (GD_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find GD library")
-   ENDIF (GD_FIND_REQUIRED)
-ENDIF (GD_FOUND)
-
-MARK_AS_ADVANCED(
-  GD_LIBRARY
-  GD_LIBRARIES
-  GD_INCLUDE_DIR
-  GD_LIBRARY_DIR
-  GD_SUPPORTS_PNG
-  GD_SUPPORTS_JPEG
-  GD_SUPPORTS_GIF
-)

CMake/FindLibDL.cmake

@@ -0,0 +1,27 @@
+# - Try to find libdl
+# Once done this will define
+#
+#  LIBDL_FOUND - system has libdl
+#  LIBDL_INCLUDE_DIRS - the libdl include directory
+#  LIBDL_LIBRARIES - Link these to use libdl
+#  LIBDL_NEEDS_UNDERSCORE - If extern "C" symbols are prefixed (BSD/Apple)
+#
+
+find_path (LIBDL_INCLUDE_DIRS NAMES dlfcn.h)
+find_library (LIBDL_LIBRARIES NAMES dl)
+include (FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibDL DEFAULT_MSG
+    LIBDL_LIBRARIES
+    LIBDL_INCLUDE_DIRS)
+
+SET(CMAKE_REQUIRED_LIBRARIES dl)
+INCLUDE(CheckCSourceRuns)
+CHECK_C_SOURCE_RUNS("#include <dlfcn.h>
+void testfunc() {}
+int main() {
+  testfunc();
+  return dyslm(0, \"_testfunc\") != (void*)0;
+}" LIBDL_NEEDS_UNDERSCORE)
+
+mark_as_advanced(LIBDL_INCLUDE_DIRS LIBDL_LIBRARIES LIBDL_NEEDS_UNDERSCORE)

CMake/FindLibDwarf.cmake

@@ -18,7 +18,7 @@ endif (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
 
 find_path (DWARF_INCLUDE_DIR
     NAMES
-      dwarf.h
+      libdwarf.h dwarf.h
     PATHS
       /usr/include
       /usr/include/libdwarf
@@ -50,5 +50,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibDwarf DEFAULT_MSG
     LIBDWARF_LIBRARIES
     LIBDWARF_INCLUDE_DIRS)
 
+if (LIBDWARF_LIBRARIES AND LIBDWARF_INCLUDE_DIRS)
+  set(CMAKE_REQUIRED_INCLUDES ${LIBDWARF_INCLUDE_DIRS})
+  set(CMAKE_REQUIRED_LIBRARIES ${LIBDWARF_LIBRARIES})
+  include(CheckSymbolExists)
+  CHECK_SYMBOL_EXISTS(dwarf_encode_leb128 "libdwarf.h" LIBDWARF_HAVE_ENCODE_LEB128)
+endif()
+
 mark_as_advanced(LIBDW_INCLUDE_DIR DWARF_INCLUDE_DIR)
 mark_as_advanced(LIBDWARF_INCLUDE_DIRS LIBDWARF_LIBRARIES)
+mark_as_advanced(LIBDWARF_HAVE_ENCODE_LEB128)

CMake/FindLibJpeg.cmake

@@ -0,0 +1,14 @@
+
+if (LIBJPEG_LIBRARIES AND LIBJPEG_INCLUDE_DIRS)
+  set (LibJpeg_FIND_QUIETLY TRUE)
+endif (LIBJPEG_LIBRARIES AND LIBJPEG_INCLUDE_DIRS)
+
+find_path(LIBJPEG_INCLUDE_DIRS NAMES jpeglib.h)
+find_library(LIBJPEG_LIBRARIES NAMES jpeg)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibJpeg DEFAULT_MSG
+    LIBJPEG_LIBRARIES
+    LIBJPEG_INCLUDE_DIRS)
+
+mark_as_advanced(LIBJPEG_INCLUDE_DIRS LIBJPEG_LIBRARIES)

CMake/FindLibNuma.cmake

@@ -0,0 +1,13 @@
+if (LIBNUMA_LIBRARIES AND LIBNUMA_INCLUDE_DIRS)
+  set (LibNuma_FIND_QUIETLY TRUE)
+endif (LIBNUMA_LIBRARIES AND LIBNUMA_INCLUDE_DIRS)
+
+find_path(LIBNUMA_INCLUDE_DIRS NAMES numa.h)
+find_library(LIBNUMA_LIBRARIES NAMES numa)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibNuma DEFAULT_MSG
+    LIBNUMA_LIBRARIES
+    LIBNUMA_INCLUDE_DIRS)
+
+mark_as_advanced(LIBNUMA_INCLUDE_DIRS LIBNUMA_LIBRARIES)

CMake/FindLibPng.cmake

@@ -0,0 +1,14 @@
+
+if (LIBPNG_LIBRARIES AND LIBPNG_INCLUDE_DIRS)
+  set (LibPng_FIND_QUIETLY TRUE)
+endif (LIBPNG_LIBRARIES AND LIBPNG_INCLUDE_DIRS)
+
+find_path(LIBPNG_INCLUDE_DIRS NAMES png.h)
+find_library(LIBPNG_LIBRARIES NAMES png)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibPng DEFAULT_MSG
+    LIBPNG_LIBRARIES
+    LIBPNG_INCLUDE_DIRS)
+
+mark_as_advanced(LIBPNG_INCLUDE_DIRS LIBPNG_LIBRARIES)

CMake/FindLibUODBC.cmake

@@ -0,0 +1,12 @@
+if (LIBODBC_LIBRARIES AND LIBODBC_INCLUDE_DIRS)
+  set (LibUODBC_FIND_QUIETLY TRUE)
+endif (LIBODBC_LIBRARIES AND LIBODBC_INCLUDE_DIRS)
+
+find_path (LIBODBC_INCLUDE_DIRS NAMES sqlext.h)
+find_library (LIBODBC_LIBRARIES NAMES odbc)
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUODBC DEFAULT_MSG
+    LIBODBC_LIBRARIES
+    LIBODBC_INCLUDE_DIRS)
+
+mark_as_advanced(LIBODBC_INCLUDE_DIRS LIBODBC_LIBRARIES)

CMake/FindLibVpx.cmake

@@ -0,0 +1,14 @@
+
+if (LIBVPX_LIBRARIES AND LIBVPX_INCLUDE_DIRS)
+  set (LibVpx_FIND_QUIETLY TRUE)
+endif (LIBVPX_LIBRARIES AND LIBVPX_INCLUDE_DIRS)
+
+find_path(LIBVPX_INCLUDE_DIRS NAMES vpx_codec.h)
+find_library(LIBVPX_LIBRARIES NAMES vpx)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibVpx DEFAULT_MSG
+    LIBVPX_LIBRARIES
+    LIBVPX_INCLUDE_DIRS)
+
+mark_as_advanced(LIBVPX_INCLUDE_DIRS LIBVPX_LIBRARIES)

CMake/FindLibYaml.cmake

@@ -0,0 +1,13 @@
+if (LibYaml_LIBRARIES AND LibYaml_INCLUDE_DIRS)
+  set (LibYaml_FIND_QUIETLY TRUE)
+endif (LibYaml_LIBRARIES AND LibYaml_INCLUDE_DIRS)
+
+find_path (LibYaml_INCLUDE_DIRS NAMES yaml.h)
+find_library (LibYaml_LIBRARIES NAMES yaml)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibYaml DEFAULT_MSG
+    LibYaml_LIBRARIES
+    LibYaml_INCLUDE_DIRS)
+
+mark_as_advanced(LibYaml_INCLUDE_DIRS LibYaml_LIBRARIES)

CMake/FindLibunwind.cmake

@@ -1,28 +0,0 @@
-#
-# $Id$
-#
-# - Find libunwind
-# Find libunwind
-#
-#  LIBUNWIND_INCLUDE_DIR - where to find unwind.h and libunwind.h
-#  LIBUNWIND_LIBRARY     - List of libraries when using libunwind
-#  LIBUNWIND_FOUND       - True if libunwind found.
-
-
-if(LIBUNWIND_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(LIBUNWIND_FIND_QUIETLY TRUE)
-endif()
-
-FIND_PATH(LIBUNWIND_INCLUDE_DIR libunwind.h)
-if(NOT EXISTS "${LIBUNWIND_INCLUDE_DIR}/unwind.h")
-  message(FATAL_ERROR "libunwind.h found without matching unwind.h")
-  SET(LIBUNWIND_INCLUDE_DIR "")
-endif()
-
-FIND_LIBRARY(LIBUNWIND_LIBRARY unwind)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUNWIND DEFAULT_MSG LIBUNWIND_LIBRARY LIBUNWIND_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(LIBUNWIND_LIBRARY LIBUNWIND_INCLUDE_DIR)

CMake/FollySetup.cmake

@@ -0,0 +1,28 @@
+# folly-config.h is a generated file from autotools
+# We need to do the equivalent checks here and use
+# add_definitions as needed
+add_definitions(-DFOLLY_NO_CONFIG=1)
+
+INCLUDE(CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES("
+extern \"C\" void (*test_ifunc(void))() { return 0; }
+void func() __attribute__((ifunc(\"test_ifunc\")));
+" FOLLY_IFUNC)
+if (FOLLY_IFUNC)
+        add_definitions("-DHAVE_IFUNC=1")
+endif()
+
+set(CMAKE_REQUIRED_LIBRARIES rt)
+include(CheckFunctionExists)
+CHECK_FUNCTION_EXISTS("clock_gettime" HAVE_CLOCK_GETTIME)
+
+if (HAVE_CLOCK_GETTIME)
+	add_definitions("-DFOLLY_HAVE_CLOCK_GETTIME=1")
+endif()
+set(CMAKE_REQUIRED_LIBRARIES)
+
+find_path(FEATURES_H_INCLUDE_DIR NAMES features.h)
+if (FEATURES_H_INCLUDE_DIR)
+	include_directories("${FEATURES_H_INCLUDE_DIR}")
+	add_definitions("-DFOLLY_HAVE_FEATURES_H=1")
+endif()

CMake/HPHPCompiler.cmake

@@ -0,0 +1,56 @@
+if(CMAKE_COMPILER_IS_GNUCC)
+	INCLUDE(CheckCSourceCompiles)
+
+	CHECK_C_SOURCE_COMPILES("#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#if GCC_VERSION < 40700
+#error Not GCC 4.7.0+
+#endif
+int main() { return 0; }" HAVE_GCC_47)
+
+	if (NOT HAVE_GCC_47)
+		message(FATAL_ERROR "Need at least GCC 4.7")
+	endif()
+
+	CHECK_C_SOURCE_COMPILES("#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#if GCC_VERSION < 40800
+#error Not GCC 4.8.0+
+#endif
+int main() { return 0; }" HAVE_GCC_48)
+
+endif()
+
+set(FREEBSD FALSE)
+set(LINUX FALSE)
+
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+	set(FREEBSD TRUE)
+endif()
+
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+	set(LINUX TRUE)
+endif()
+
+if($ENV{CXX} MATCHES "icpc")
+	set(CMAKE_C_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -w")
+	set(CMAKE_CXX_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -fno-omit-frame-pointer -ftemplate-depth-180 -Wall -Woverloaded-virtual -Wno-deprecated -w1 -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names")
+else()
+	set(GNUCC_48_OPT "")
+	if(HAVE_GCC_48)
+		set(GNUCC_48_OPT "-Wno-unused-local-typedefs -fno-canonical-system-headers -Wno-deprecated-declarations")
+	endif()
+	set(CMAKE_C_FLAGS "-w")
+	set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-180 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names -Wno-error=array-bounds -Wno-error=switch -std=gnu++11 -Werror=format-security -Wno-unused-result -Wno-sign-compare -Wno-attributes -Wno-maybe-uninitialized -mcrc32 ${GNUCC_48_OPT}")
+endif()
+
+if(${CMAKE_CXX_COMPILER} MATCHES ".*clang.*")
+	set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-180 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names -Wno-error=array-bounds -Wno-error=switch -std=gnu++11 -Werror=format-security -Wno-unused-result -Wno-sign-compare -Wno-attributes -Wno-maybe-uninitialized -Wno-mismatched-tags -Wno-unknown-warning-option -Wno-return-type-c-linkage -Qunused-arguments")
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCC)
+	set(CMAKE_C_FLAGS_RELEASE "-O3")
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+endif()
+

CMake/HPHPFindLibs.cmake

@@ -17,10 +17,25 @@
 
 include(CheckFunctionExists)
 
+# libdl
+find_package(LibDL)
+if (LIBDL_INCLUDE_DIRS)
+	add_definitions("-DHAVE_LIBDL")
+	include_directories(${LIBDL_INCLUDE_DIRS})
+	if (LIBDL_NEEDS_UNDERSCORE)
+		add_definitions("-DLIBDL_NEEDS_UNDERSCORE")
+	endif()
+endif()
+
 # boost checks
 find_package(Boost 1.48.0 COMPONENTS system program_options filesystem regex REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
+# Boost 1.49 supports a better flat_multimap, but 1.48 is good enough
+if (Boost_VERSION GREATER 104899)
+	add_definitions("-DHAVE_BOOST1_49")
+endif()
+
 
 # features.h
 FIND_PATH(FEATURES_HEADER features.h)
@@ -38,10 +53,6 @@ if (LIBINOTIFY_INCLUDE_DIR)
 	include_directories(${LIBINOTIFY_INCLUDE_DIR})
 endif()
 
-# unwind checks
-find_package(Libunwind REQUIRED)
-include_directories(${LIBUNWIND_INCLUDE_DIR})
-
 # iconv checks
 find_package(Libiconv REQUIRED)
 include_directories(${LIBICONV_INCLUDE_DIR})
@@ -79,29 +90,46 @@ include_directories(${LIBEVENT_INCLUDE_DIR})
 
 set(CMAKE_REQUIRED_LIBRARIES "${LIBEVENT_LIB}")
 CHECK_FUNCTION_EXISTS("evhttp_bind_socket_with_fd" HAVE_CUSTOM_LIBEVENT)
-if (NOT HAVE_CUSTOM_LIBEVENT)
-	unset(HAVE_CUSTOM_LIBEVENT CACHE)
-	unset(LIBEVENT_INCLUDE_DIR CACHE)
-	unset(LIBEVENT_LIB CACHE)
-	unset(LibEvent_FOUND CACHE)
-	message(FATAL_ERROR "Custom libevent is required with HipHop patches")
-endif ()
+if(HAVE_CUSTOM_LIBEVENT)
+        message("Using custom LIBEVENT")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_CUSTOM_LIBEVENT")
+endif()
 set(CMAKE_REQUIRED_LIBRARIES)
 
-# GD checks
-find_package(GD REQUIRED)
+find_package(LibUODBC)
+if (LIBUODBC_INCLUDE_DIRS)
+	include_directories(${LIBUODBC_INCLUDE_DIRS})
+	add_definitions("-DHAVE_UODBC")
+endif ()
 
-if (WANT_FB_LIBMCC)
-	add_definitions(-DHPHP_WITH_LIBMCC)
-	message(FATAL_ERROR Need to add libmcc and libch for linking)
-else ()
-	# nothing for now
+# GD checks
+add_definitions(-DPNG_SKIP_SETJMP_CHECK)
+find_package(LibVpx)
+if (LIBVPX_INCLUDE_DIRS)
+	include_directories(${LIBVPX_INCLUDE_DIRS})
+	add_definitions("-DHAVE_GD_WEBP")
+endif()
+find_package(LibJpeg)
+if (LIBJPEG_INCLUDE_DIRS)
+	include_directories(${LIBJPEG_INCLUDE_DIRS})
+	add_definitions("-DHAVE_GD_JPG")
+endif()
+find_package(LibPng)
+if (LIBPNG_INCLUDE_DIRS)
+	include_directories(${LIBPNG_INCLUDE_DIRS})
+	add_definitions("-DHAVE_GD_PNG")
+endif()
+find_package(Freetype)
+if (FREETYPE_INCLUDE_DIRS)
+	include_directories(${FREETYPE_INCLUDE_DIRS})
+	add_definitions("-DHAVE_LIBFREETYPE -DHAVE_GD_FREETYPE -DENABLE_GD_TTF")
 endif()
 
+# libXed
 find_package(LibXed)
 if (LibXed_INCLUDE_DIR AND LibXed_LIBRARY)
 	include_directories(${LibXed_INCLUDE_DIR})
-	add_definitions(-DHAVE_LIBXED)
+	add_definitions("-DHAVE_LIBXED")
 endif()
 
 # CURL checks
@@ -137,6 +165,7 @@ include_directories("${HPHP_HOME}/hphp/third_party/libmbfl/filter")
 include_directories("${HPHP_HOME}/hphp/third_party/lz4")
 include_directories("${HPHP_HOME}/hphp/third_party/double-conversion/src")
 include_directories("${HPHP_HOME}/hphp/third_party/folly")
+include_directories("${HPHP_HOME}/hphp/third_party/libzip")
 
 # ICU
 find_package(ICU REQUIRED)
@@ -150,9 +179,6 @@ if (ICU_FOUND)
 	include_directories(${ICU_INCLUDE_DIRS})
 endif (ICU_FOUND)
 
-# (google heap OR cpu profiler) AND libunwind 
-FIND_LIBRARY(UNWIND_LIB unwind)
-
 # jemalloc/tmalloc and profiler
 if (USE_GOOGLE_HEAP_PROFILER OR USE_GOOGLE_CPU_PROFILER)
 	FIND_LIBRARY(GOOGLE_PROFILER_LIB profiler)
@@ -178,10 +204,30 @@ if (USE_GOOGLE_HEAP_PROFILER AND GOOGLE_PROFILER_LIB)
 endif()
 
 if (USE_JEMALLOC AND NOT GOOGLE_TCMALLOC_ENABLED)
-	FIND_LIBRARY(JEMALLOC_LIB jemalloc)
-	if (JEMALLOC_LIB)
-		message(STATUS "Found jemalloc: ${JEMALLOC_LIB}")
-		set(JEMALLOC_ENABLED 1)
+	FIND_LIBRARY(JEMALLOC_LIB NAMES jemalloc)
+	FIND_PATH(JEMALLOC_INCLUDE_DIR NAMES jemalloc/jemalloc.h)
+
+	if (JEMALLOC_INCLUDE_DIR AND JEMALLOC_LIB)
+		include_directories(${JEMALLOC_INCLUDE_DIR})
+
+		set (CMAKE_REQUIRED_INCLUDES ${JEMALLOC_INCLUDE_DIR})
+		INCLUDE(CheckCXXSourceCompiles)
+		CHECK_CXX_SOURCE_COMPILES("
+#include <jemalloc/jemalloc.h>
+int main(void) {
+#if !defined(JEMALLOC_VERSION_MAJOR) || (JEMALLOC_VERSION_MAJOR < 3)
+# error \"jemalloc version >= 3.0.0 required\"
+#endif
+	return 0;
+}" JEMALLOC_VERSION_3)
+		set (CMAKE_REQUIRED_INCLUDES)
+
+		if (JEMALLOC_VERSION_3)
+			message(STATUS "Found jemalloc: ${JEMALLOC_LIB}")
+			set(JEMALLOC_ENABLED 1)
+		else()
+			message(STATUS "Found jemalloc, but it was too old")
+		endif()
 	endif()
 endif()
 
@@ -197,9 +243,6 @@ endif()
 
 if (JEMALLOC_ENABLED)
 	add_definitions(-DUSE_JEMALLOC=1)
-	if (APPLE)
-		add_definitions(-DJEMALLOC_MANGLE=1 -DJEMALLOC_EXPERIMENTAL=1)
-	endif()
 else()
 	add_definitions(-DNO_JEMALLOC=1)
 endif()
@@ -259,14 +302,26 @@ include_directories(${NCURSES_INCLUDE_PATH})
 find_package(PThread REQUIRED)
 include_directories(${LIBPTHREAD_INCLUDE_DIRS})
 
-find_package(Readline REQUIRED)
-include_directories(${READLINE_INCLUDE_DIR})
+# Either Readline or Editline (for hphpd)
+find_package(Readline)
+find_package(Editline)
+if (READLINE_INCLUDE_DIR)
+	include_directories(${READLINE_INCLUDE_DIR})
+elseif (EDITLINE_INCLUDE_DIRS)
+	add_definitions("-DUSE_EDITLINE")
+	include_directories(${EDITLINE_INCLUDE_DIRS})
+else()
+	message(FATAL_ERROR "Could not find Readline or Editline")
+endif()
 
 find_package(CClient REQUIRED)
 include_directories(${CCLIENT_INCLUDE_PATH})
 
 find_package(LibDwarf REQUIRED)
 include_directories(${LIBDWARF_INCLUDE_DIRS})
+if (LIBDWARF_HAVE_ENCODE_LEB128)
+	add_definitions("-DHAVE_LIBDWARF_20130729")
+endif()
 
 find_package(LibElf REQUIRED)
 include_directories(${LIBELF_INCLUDE_DIRS})
@@ -280,17 +335,26 @@ if (NOT RECENT_CCLIENT)
 	message(FATAL_ERROR "Your version of c-client is too old, you need 2007")
 endif()
 
-CONTAINS_STRING("${CCLIENT_INCLUDE_PATH}/linkage.h" auth_gss CCLIENT_NEEDS_PAM)
+
+if (EXISTS "${CCLIENT_INCLUDE_PATH}/linkage.c")
+	CONTAINS_STRING("${CCLIENT_INCLUDE_PATH}/linkage.c" auth_gss CCLIENT_HAS_GSS)
+elseif (EXISTS "${CCLIENT_INCLUDE_PATH}/linkage.h")
+    CONTAINS_STRING("${CCLIENT_INCLUDE_PATH}/linkage.h" auth_gss CCLIENT_HAS_GSS)
+endif()
+
+find_package(Libpam)
+if (PAM_INCLUDE_PATH)
+	include_directories(${PAM_INCLUDE_PATH})
+endif()
+
+if (NOT CCLIENT_HAS_GSS)
+	add_definitions(-DSKIP_IMAP_GSS=1)
+endif()
 
 if (EXISTS "${CCLIENT_INCLUDE_PATH}/linkage.c")
 	CONTAINS_STRING("${CCLIENT_INCLUDE_PATH}/linkage.c" ssl_onceonlyinit CCLIENT_HAS_SSL)
-endif()
-
-if (CCLIENT_NEEDS_PAM)
-	find_package(Libpam REQUIRED)
-	include_directories(${PAM_INCLUDE_PATH})
-else()
-	add_definitions(-DSKIP_IMAP_GSS=1)
+elseif (EXISTS "${CCLIENT_INCLUDE_PATH}/linkage.h")
+	CONTAINS_STRING("${CCLIENT_INCLUDE_PATH}/linkage.h" ssl_onceonlyinit CCLIENT_HAS_SSL)
 endif()
 
 if (NOT CCLIENT_HAS_SSL)
@@ -335,6 +399,9 @@ endif()
 
 if (APPLE)
 	find_library(LIBINTL_LIBRARIES NAMES intl libintl)
+	if (LIBINTL_INCLUDE_DIR)
+		include_directories(${LIBINTL_INCLUDE_DIR})
+	endif()
 	find_library(KERBEROS_LIB NAMES gssapi_krb5)
 endif()
 
@@ -349,6 +416,10 @@ include_directories(${HPHP_HOME}/hphp)
 include_directories(${HPHP_HOME}/hphp/system/gen)
 
 macro(hphp_link target)
+	if (LIBDL_LIBRARIES)
+		target_link_libraries(${target} ${LIBDL_LIBRARIES})
+	endif ()
+
 	if (GOOGLE_HEAP_PROFILER_ENABLED OR GOOGLE_CPU_PROFILER_ENABLED)
 		target_link_libraries(${target} ${GOOGLE_PROFILER_LIB})
 	endif()
@@ -364,7 +435,6 @@ macro(hphp_link target)
 	endif()
 
 	target_link_libraries(${target} ${Boost_LIBRARIES})
-	target_link_libraries(${target} ${LIBUNWIND_LIBRARY})
 	target_link_libraries(${target} ${MYSQL_CLIENT_LIBS})
 	target_link_libraries(${target} ${PCRE_LIBRARY})
 	target_link_libraries(${target} ${ICU_DATA_LIBRARIES} ${ICU_I18N_LIBRARIES} ${ICU_LIBRARIES})
@@ -418,7 +488,21 @@ endif()
 	target_link_libraries(${target} ${ONIGURUMA_LIBRARIES})
 	target_link_libraries(${target} ${Mcrypt_LIB})
 	target_link_libraries(${target} ${GD_LIBRARY})
-
+if (FREETYPE_LIBRARIES)
+	target_link_libraries(${target} ${FREETYPE_LIBRARIES})
+endif()
+if (LIBJPEG_LIBRARIES)
+	target_link_libraries(${target} ${LIBJPEG_LIBRARIES})
+endif()
+if (LIBPNG_LIBRARIES)
+	target_link_libraries(${target} ${LIBPNG_LIBRARIES})
+endif()
+if (LIBVPX_LIBRARIES)
+	target_link_libraries(${target} ${LIBVPX_LIBRARIES})
+endif()
+if (LIBUODBC_LIBRARIES)
+	target_link_libraries(${target} ${LIBUODBC_LIBRARIES})
+endif()
 	target_link_libraries(${target} ${LDAP_LIBRARIES})
 	target_link_libraries(${target} ${LBER_LIBRARIES})
 
@@ -434,15 +518,21 @@ endif()
 	target_link_libraries(${target} lz4)
 	target_link_libraries(${target} double-conversion)
 	target_link_libraries(${target} folly)
+	target_link_libraries(${target} zip_static)
 
 	target_link_libraries(${target} afdt)
 	target_link_libraries(${target} mbfl)
 
-	target_link_libraries(${target} ${READLINE_LIBRARY})
+	if (READLINE_LIBRARY)
+		target_link_libraries(${target} ${READLINE_LIBRARY})
+	elseif (EDITLINE_LIBRARIES)
+		target_link_libraries(${target} ${EDITLINE_LIBRARIES})
+	endif()
+
 	target_link_libraries(${target} ${NCURSES_LIBRARY})
 	target_link_libraries(${target} ${CCLIENT_LIBRARY})
 
-	if (CCLIENT_NEEDS_PAM)
+	if (PAM_LIBRARY)
 		target_link_libraries(${target} ${PAM_LIBRARY})
 	endif()
 

CMake/HPHPFunctions.cmake

@@ -38,6 +38,27 @@ function(auto_sources RETURN_VALUE PATTERN SOURCE_SUBDIRS)
 	set(${RETURN_VALUE} ${${RETURN_VALUE}} PARENT_SCOPE)
 endfunction(auto_sources)
 
+macro(HHVM_SELECT_SOURCES DIR)
+	auto_sources(files "*.cpp" "RECURSE" "${DIR}")
+	foreach(f ${files})
+		if (NOT (${f} MATCHES "(ext_hhvm|/(old-)?tests?/)"))
+			list(APPEND CXX_SOURCES ${f})
+		endif()
+	endforeach()
+	auto_sources(files "*.c" "RECURSE" "${DIR}")
+	foreach(f ${files})
+		if (NOT (${f} MATCHES "(ext_hhvm|/(old-)?tests?/)"))
+			list(APPEND C_SOURCES ${f})
+		endif()
+	endforeach()
+	auto_sources(files "*.S" "RECURSE" "${DIR}")
+	foreach(f ${files})
+		if (NOT (${f} MATCHES "(ext_hhvm|/(old-)?tests?/)"))
+			list(APPEND ASM_SOURCES ${f})
+		endif()
+	endforeach()
+endmacro(HHVM_SELECT_SOURCES)
+
 function(CONTAINS_STRING FILE SEARCH RETURN_VALUE)
 	file(STRINGS ${FILE} FILE_CONTENTS REGEX ".*${SEARCH}.*")
 	if (FILE_CONTENTS)
@@ -67,3 +88,60 @@ macro(MYSQL_SOCKET_SEARCH)
 		set(MYSQL_UNIX_SOCK_ADDR ${MYSQL_SOCK} CACHE STRING "Path to MySQL Socket")
 	endif()
 endmacro()
+
+function(embed_systemlib TARGET DEST SOURCE SECTNAME)
+	if (APPLE)
+	        target_link_libraries(${TARGET} -Wl,-sectcreate,__text,${SECTNAME},${SOURCE})
+	else()
+	        add_custom_command(TARGET ${TARGET} POST_BUILD
+	                   COMMAND "objcopy"
+	                   ARGS "--add-section" "${SECTNAME}=${SOURCE}" ${DEST}
+	                   COMMENT "Embedding ${SOURCE} in ${TARGET} as ${SECTNAME}")
+	endif()
+	# Add the systemlib file to the "LINK_DEPENDS" for the systemlib, this will cause it
+	# to be relinked and the systemlib re-embedded
+	set_property(TARGET ${TARGET} APPEND PROPERTY LINK_DEPENDS ${SOURCE})
+endfunction(embed_systemlib)
+
+function(embed_all_systemlibs TARGET DEST)
+	embed_systemlib(${TARGET} ${DEST} ${HPHP_HOME}/hphp/system/systemlib.php systemlib)
+	auto_sources(SYSTEMLIBS "ext_*.php" "RECURSE" "${HPHP_HOME}/hphp/runtime")
+	foreach(SLIB ${SYSTEMLIBS})
+		get_filename_component(SLIB_BN ${SLIB} "NAME_WE")
+		string(LENGTH ${SLIB_BN} SLIB_BN_LEN)
+		math(EXPR SLIB_BN_REL_LEN "${SLIB_BN_LEN} - 4")
+		string(SUBSTRING ${SLIB_BN} 4 ${SLIB_BN_REL_LEN} SLIB_EXTNAME)
+		string(MD5 SLIB_HASH_NAME ${SLIB_EXTNAME})
+		string(SUBSTRING ${SLIB_HASH_NAME} 0 12 SLIB_HASH_NAME_SHORT)
+		embed_systemlib(${TARGET} ${DEST} ${SLIB} "ext.${SLIB_HASH_NAME_SHORT}")
+	endforeach()
+endfunction(embed_all_systemlibs)
+
+# Custom install function that doesn't relink, instead it uses chrpath to change it, if
+# it's available, otherwise, it leaves the chrpath alone
+function(HHVM_INSTALL TARGET DEST)
+	get_target_property(LOC ${TARGET} LOCATION)
+	get_target_property(TY ${TARGET} TYPE)
+	if (FOUND_CHRPATH)
+		get_target_property(RPATH ${TARGET} INSTALL_RPATH)
+		if (NOT RPATH STREQUAL "RPATH-NOTFOUND")
+			if (RPATH STREQUAL "")
+				install(CODE "execute_process(COMMAND \"${CHRPATH}\" \"-d\" \"${LOC}\" ERROR_QUIET)")
+			else()
+				install(CODE "execute_process(COMMAND \"${CHRPATH}\" \"-r\" \"${RPATH}\" \"${LOC}\" ERROR_QUIET)")
+			endif()
+		endif()
+	endif()
+	install(CODE "FILE(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${DEST}\" TYPE ${TY} FILES \"${LOC}\")")
+endfunction(HHVM_INSTALL)
+
+function(HHVM_EXTENSION EXTNAME)
+	list(REMOVE_AT ARGV 0)
+	add_library(${EXTNAME} SHARED ${ARGV})
+	set_target_properties(${EXTNAME} PROPERTIES PREFIX "")
+	set_target_properties(${EXTNAME} PROPERTIES SUFFIX ".so")
+endfunction()
+
+function(HHVM_SYSTEMLIB EXTNAME SOURCE_FILE)
+	embed_systemlib(${EXTNAME} "${EXTNAME}.so" ${SOURCE_FILE} systemlib)
+endfunction()

CMake/HPHPSetup.cmake

@@ -1,5 +1,37 @@
 include(Options)
 
+# Do this until cmake has a define for ARMv8
+INCLUDE(CheckCXXSourceCompiles)
+CHECK_CXX_SOURCE_COMPILES("
+#ifndef __AARCH64EL__
+#error Not ARMv8  
+#endif
+int main() { return 0; }" IS_AARCH64)
+
+if (APPLE OR IS_AARCH64)
+	set(HHVM_ANCHOR_SYMS -Wl,-u,_register_libevent_server)
+else()
+	set(ENABLE_FASTCGI 1)
+	set(HHVM_ANCHOR_SYMS -Wl,-uregister_libevent_server,-uregister_fastcgi_server)
+endif()
+
+set(HHVM_LINK_LIBRARIES
+    hphp_analysis
+    hphp_runtime_static
+    ext_hhvm_static
+    hphp_system
+    hphp_parser
+    hphp_zend
+    hphp_util
+    hphp_hhbbc
+    vixl neo
+    ${HHVM_ANCHOR_SYMS})
+
+if(ENABLE_FASTCGI)
+	LIST(APPEND HHVM_LINK_LIBRARIES hphp_thrift)
+	LIST(APPEND HHVM_LINK_LIBRARIES hphp_proxygen)
+endif()
+
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE "Release")
 endif()
@@ -8,29 +40,13 @@ IF(NOT DEFINED CMAKE_PREFIX_PATH)
   message(STATUS "CMAKE_PREFIX_PATH was missing, proceeding anyway")
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC)
-	INCLUDE(CheckCSourceCompiles)
-	CHECK_C_SOURCE_COMPILES("#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if GCC_VERSION < 40600
-#error Need GCC 4.6.0+
-#endif
-int main() { return 0; }" HAVE_GCC_46)
-
-	if(NOT HAVE_GCC_46)
-		message(FATAL_ERROR "Need at least GCC 4.6")
-	endif()
-
-endif()
-
-set(FREEBSD FALSE)
-set(LINUX FALSE)
-
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
-	set(FREEBSD TRUE)
-endif()
-
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-	set(LINUX TRUE)
+# Look for the chrpath tool so we can warn if it's not there
+find_program(CHRPATH chrpath)
+IF (CHRPATH STREQUAL "CHRPATH-NOTFOUND")
+    SET(FOUND_CHRPATH OFF)
+    message(WARNING "chrpath not found, rpath will not be stripped from installed binaries")
+else()
+    SET(FOUND_CHRPATH ON)
 endif()
 
 LIST(APPEND CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
@@ -42,11 +58,11 @@ if(APPLE)
 	endif()
 endif()
 
+include(HPHPCompiler)
 include(HPHPFunctions)
 include(HPHPFindLibs)
 
-add_definitions(-D_REENTRANT=1 -D_PTHREADS=1 -D__STDC_FORMAT_MACROS)
-add_definitions(-DHHVM_LIB_PATH_DEFAULT="${HPHP_HOME}/bin")
+add_definitions(-D_REENTRANT=1 -D_PTHREADS=1 -D__STDC_FORMAT_MACROS -DFOLLY_HAVE_WEAK_SYMBOLS=1)
 
 if (LINUX)
 	add_definitions(-D_GNU_SOURCE)
@@ -61,22 +77,6 @@ else()
 	message("Generating DEBUG build")
 endif()
 
-if(INFINITE_LOOP_DETECTION)
-	add_definitions(-DINFINITE_LOOP_DETECTION=1)
-endif()
-
-if(INFINITE_RECURSION_DETECTION)
-	add_definitions(-DINFINITE_RECURSION_DETECTION=1)
-endif()
-
-if(REQUEST_TIMEOUT_DETECTION)
-	add_definitions(-DREQUEST_TIMEOUT_DETECTION=1)
-endif()
-
-if(ENABLE_LATE_STATIC_BINDING)
-	add_definitions(-DENABLE_LATE_STATIC_BINDING=1)
-endif()
-
 if(DEBUG_MEMORY_LEAK)
 	add_definitions(-DDEBUG_MEMORY_LEAK=1)
 endif()
@@ -93,10 +93,6 @@ if(HOTPROFILER)
 	add_definitions(-DHOTPROFILER=1)
 endif()
 
-if(HOTPROFILER_NO_BUILTIN)
-	add_definitions(-DHOTPROFILER_NO_BUILTIN=1)
-endif()
-
 if(EXECUTION_PROFILER)
 	add_definitions(-DEXECUTION_PROFILER=1)
 endif()
@@ -123,28 +119,20 @@ if(APPLE)
 	add_definitions(-DMACOSX_DEPLOYMENT_TARGET=10.6)
 endif()
 
+if(ENABLE_FASTCGI)
+	add_definitions(-DENABLE_FASTCGI=1)
+endif ()
+
+if(DISABLE_HARDWARE_COUNTERS)
+	add_definitions(-DNO_HARDWARE_COUNTERS=1)
+endif ()
+
 # enable the OSS options if we have any
 add_definitions(-DHPHP_OSS=1)
 
 # later versions of binutils don't play well without automake
 add_definitions(-DPACKAGE=hhvm -DPACKAGE_VERSION=Release)
 
-IF($ENV{CXX} MATCHES "icpc")
-	set(CMAKE_C_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -w")
-	set(CMAKE_CXX_FLAGS "-no-ipo -fp-model precise -wd584 -wd1418 -wd1918 -wd383 -wd869 -wd981 -wd424 -wd1419 -wd444 -wd271 -wd2259 -wd1572 -wd1599 -wd82 -wd177 -wd593 -fno-omit-frame-pointer -ftemplate-depth-120 -Wall -Woverloaded-virtual -Wno-deprecated -w1 -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names")
-else()
-	set(CMAKE_C_FLAGS "-w")
-	set(CMAKE_CXX_FLAGS "-fno-gcse -fno-omit-frame-pointer -ftemplate-depth-120 -Wall -Woverloaded-virtual -Wno-deprecated -Wno-strict-aliasing -Wno-write-strings -Wno-invalid-offsetof -fno-operator-names -Wno-error=array-bounds -Wno-error=switch -std=gnu++0x -Werror=format-security -Wno-unused-result -Wno-sign-compare")
-endif()
-
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET (CMAKE_C_FLAGS_RELEASE "-O3")
-ENDIF()
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET (CMAKE_CXX_FLAGS_RELEASE "-O3")
-ENDIF()
-
 include_directories(${HPHP_HOME}/hphp)
 include_directories(${HPHP_HOME}/hphp/lib/system/gen)
 include_directories(${HPHP_HOME})

CMake/Options.cmake

@@ -1,24 +1,18 @@
 #set(CMAKE_BUILD_TYPE Debug)
 
-option(ENABLE_LATE_STATIC_BINDING "Enable Late Static Binding" ON)
-
-option(INFINITE_LOOP_DETECTION "Enable Infinite Loop Detection" ON)
-option(INFINITE_RECURSION_DETECTION "Enable Infinite Recursion Detection" ON)
-option(REQUEST_TIMEOUT_DETECTION "Enable Timeout Detection" ON)
-
 option(ALWAYS_ASSERT "Enabled asserts in a release build" OFF)
 option(DEBUG_MEMORY_LEAK "Allow easier debugging of memory leaks" OFF)
 option(DEBUG_APC_LEAK "Allow easier debugging of apc leaks" OFF)
 
 option(HOTPROFILER "Enable support for the hot-profiler" OFF)
-option(HOTPROFILER_NO_BUILTIN "Don't consider builtins for the hot-profiler" OFF)
 option(EXECUTION_PROFILER "Enable the execution profiler" OFF)
 option(ENABLE_FULL_SETLINE "Enable full setline function for debugger and code-coverage" OFF)
 
-option(WANT_FB_LIBMCC "want FB Memcache" OFF)
-
 option(USE_JEMALLOC "Use jemalloc" ON)
 
 option(USE_TCMALLOC "Use tcmalloc (if jemalloc is not used)" ON)
 option(USE_GOOGLE_HEAP_PROFILER "Use Google heap profiler" OFF)
 option(USE_GOOGLE_CPU_PROFILER "Use Google cpu profiler" OFF)
+
+option(DISABLE_HARDWARE_COUNTERS "Disable hardware counters (for XenU systems)" OFF)
+

CMakeLists.txt

@@ -1,18 +1,18 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7 FATAL_ERROR)
 PROJECT(hphp C CXX ASM)
 
-IF("$ENV{HPHP_HOME}" STREQUAL "")
-	message(FATAL_ERROR "You should set the HPHP_HOME environmental")
+IF(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
+	message(FATAL_ERROR "HHVM requires a 64bit OS")
 ENDIF()
 
-file(TO_CMAKE_PATH "$ENV{HPHP_HOME}" HPHP_HOME)
+set(HPHP_HOME "$ENV{HPHP_HOME}")
+if (NOT HPHP_HOME)
+	set(HPHP_HOME "${CMAKE_CURRENT_SOURCE_DIR}")
+endif()
+message("Using HPHP_HOME == ${HPHP_HOME}")
 
-IF(NOT IS_DIRECTORY ${HPHP_HOME})
-	message(FATAL_ERROR "The value of HPHP_HOME does not exist")
-ENDIF()
-
-IF(NOT EXISTS "${HPHP_HOME}/LICENSE.PHP")
-	message(FATAL_ERROR "The value of HPHP_HOME in incorrect")
+IF(NOT EXISTS "${HPHP_HOME}/CMake/HPHPSetup.cmake")
+	message(FATAL_ERROR "Invalid HPHP_HOME. Set it to the root of your hhvm tree, or run `cmake .` from there.")
 ENDIF()
 
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
@@ -20,15 +20,5 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
 include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/HPHPFunctions.cmake")
 include(CheckFunctionExists)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/hphp)
+add_subdirectory(hphp)
 
-IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	message(FATAL_ERROR "32-bit support is currently unsupported, check back with a later version of HipHop")
-ENDIF()
-
-if ("$ENV{USE_HHVM}" STREQUAL "1")
-	message("Building for HHVM")
-endif()
-if ("$ENV{USE_HPHPC}" STREQUAL "1")
-	message(FATAL_ERROR "Building HPHPc is no longer supported")
-endif()

CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# Contributing to HipHop
+
+We'd love to have your help in making HipHop better. If you run into problems, please open an [issue](http://github.com/facebook/hiphop-php/issues), or better yet, fork us and send a pull request.
+
+If you want to help but don't know where to start, try fixing some of the [Zend tests that don't pass](hphp/test/zend/bad). You can run them with [hphp/test/run](hphp/test/run). When they work, move them to [zend/good](hphp/test/zend/good) and send a pull request.
+
+All the open issues tagged [Zend incompatibility](https://github.com/facebook/hiphop-php/issues?labels=zend+incompatibility&page=1&state=open) are real issues reported by the community in existing PHP code and [frameworks](https://github.com/facebook/hiphop-php/wiki/OSS-PHP-Frameworks-Unit-Testing:-General) that could use some attention.
+
+## Submitting Pull Requests
+
+Before changes can be accepted a [Contributor Licensing Agreement](http://developers.facebook.com/opensource/cla) ([pdf](https://github.com/facebook/hiphop-php/raw/master/hphp/doc/FB_Individual_CLA.pdf) - print, sign, scan, link) must be signed.
+
+Please add appropriate test cases as you make changes; see [here](hphp/test) for more information. Travis-CI is integrated with this GitHub project and will provide test results automatically on all pulls.
+
+## Additional Resources
+
+ * IRC:[#hhvm on freenode](http://webchat.freenode.net/?channels=hhvm)
+ * [Issue tracker](http://github.com/facebook/hiphop-php/issues)

README.md

@@ -1,33 +1,46 @@
-# HipHop VM for PHP [![Build Status](https://travis-ci.org/facebook/hiphop-php.png?branch=master)](https://travis-ci.org/facebook/hiphop-php)
+# HHVM [![Build Status](https://travis-ci.org/facebook/hhvm.png?branch=master)](https://travis-ci.org/facebook/hhvm)
 
-HipHop VM (HHVM) is a new open-source virtual machine designed for executing programs written in PHP. HHVM uses a just-in-time compilation approach to achieve superior performance while maintaining the flexibility that PHP developers are accustomed to. HipHop VM (and before it HPHPc) has realized > 5x increase in throughput for Facebook compared with Zend PHP 5.2.
+HHVM (aka the HipHop Virtual Machine) is a new open-source virtual machine designed for executing programs written in PHP. HHVM uses a just-in-time compilation approach to achieve superior performance while maintaining the flexibility that PHP developers are accustomed to. To date, HHVM (and its predecessor HPHPc before it) has realized over a 9x increase in web request throughput and over a 5x reduction in memory consumption for Facebook compared with the Zend PHP 5.2 engine + APC.
 
-HipHop is most commonly run as a standalone server, replacing both Apache and modphp.
+HHVM can be run as a standalone webserver (i.e. without the Apache webserver and the "modphp" extension). HHVM can also be used together with a FastCGI-based webserver, and work is in progress to make HHVM work smoothly with Apache.
+
+## FAQ
+
+Our [FAQ](https://github.com/facebook/hhvm/wiki/FAQ) has answers to many common questions about HHVM, from [general questions](https://github.com/facebook/hhvm/wiki/FAQ#general) to questions geared towards those that want to [use](https://github.com/facebook/hhvm/wiki/FAQ#users) or [contribute](https://github.com/facebook/hhvm/wiki/FAQ#contributors) to HHVM.
 
 ## Installing
 
-You can install a [prebuilt package](https://github.com/facebook/hiphop-php/wiki#installing-pre-built-packages-for-hhvm) or [compile from source](https://github.com/facebook/hiphop-php/wiki#building-hhvm).
+You can install a [prebuilt package](https://github.com/facebook/hhvm/wiki#installing-pre-built-packages-for-hhvm) or [compile from source](https://github.com/facebook/hhvm/wiki#building-hhvm).
 
 ## Running
 
 You can run standalone programs just by passing them to hhvm: `hhvm my_script.php`.
 
-HipHop bundles in a webserver. So if you want to run on port 80 in the current directory:
+HHVM bundles in a webserver. So if you want to run on port 80 in the current directory:
 
 ```
 sudo hhvm -m server
 ```
 
-For anything more complicated, you'll want to make a [config.hdf](https://github.com/facebook/hiphop-php/wiki/Runtime-options#server) and run `sudo hhvm -m server -c config.hdf`.
+For anything more complicated, you'll want to make a [config.hdf](https://github.com/facebook/hhvm/wiki/Runtime-options#server) and run `sudo hhvm -m server -c config.hdf`.
 
 ## Contributing
 
-We'd love to have your help in making HipHop better. If you run into problems, please open an [issue](http://github.com/facebook/hiphop-php/issues), or better yet, fork us and send a pull request. Join us on [#hhvm on freenode](http://webchat.freenode.net/?channels=hhvm).
+We'd love to have your help in making HHVM better. 
+
+Before changes can be accepted a [Contributor License Agreement](http://developers.facebook.com/opensource/cla) ([pdf](https://github.com/facebook/hhvm/raw/master/hphp/doc/FB_Individual_CLA.pdf) - print, sign, scan, link) must be signed.
+
+If you run into problems, please open an [issue](http://github.com/facebook/hhvm/issues), or better yet, [fork us and send a pull request](https://github.com/facebook/hhvm/pulls). Join us on [#hhvm on freenode](http://webchat.freenode.net/?channels=hhvm).
 
 If you want to help but don't know where to start, try fixing some of the [Zend tests that don't pass](hphp/test/zend/bad). You can run them with [hphp/test/run](hphp/test/run). When they work, move them to [zend/good](hphp/test/zend/good) and send a pull request.
 
-Before changes can be accepted a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) ([pdf](https://github.com/facebook/hiphop-php/raw/master/hphp/doc/FB_Individual_CLA.pdf) - print, sign, scan, link) must be signed.
+All the open issues tagged [Zend incompatibility](https://github.com/facebook/hhvm/issues?labels=zend+incompatibility&page=1&state=open) are real issues reported by the community in existing PHP code and [frameworks](https://github.com/facebook/hhvm/wiki/OSS-PHP-Frameworks-Unit-Testing:-General) that could use some attention. Please add appropriate test cases as you make changes; see [here](hphp/test) for more information. Travis-CI is integrated with this GitHub project and will provide test results automatically on all pulls.
 
-## Licence
 
-HipHop VM is licensed under the PHP and Zend licenses except as otherwise noted.
+## License
+
+HHVM is licensed under the PHP and Zend licenses except as otherwise noted.
+
+## Reporting Crashes
+
+See [Reporting Crashes](https://github.com/facebook/hhvm/wiki/Reporting-Crashes) for helpful tips on how to report crashes in an actionable manner.

bin/README

@@ -1 +0,0 @@
-This file just exists to keep the bin/ directory in git.

configure

@@ -3,7 +3,7 @@
 if [ "$1" = '--help' ] || [ "$1" = '-h' ]; then
 	echo 'usage: ./configure -Dvariable=argument ...\n'
 	echo 'Variables: '
-	echo '  CMAKE_BUILD_TYPE=Debug|Release        Sets build type (default Relase).'
+	echo '  CMAKE_BUILD_TYPE=Debug|Release        Sets build type (default Release).'
 
 	exit 2
 fi

configure_ubuntu_12.04.sh

@@ -1,6 +1,6 @@
 #########################################
 # 
-# Install all the dependancies for HipHop
+# Install all the dependencies for HipHop
 #
 #########################################
 
@@ -11,52 +11,107 @@ if [ "$0" != "$SCRIPT_NAME" ]; then
   exit 1
 fi
 
-export CMAKE_PREFIX_PATH=`/bin/pwd`/..
-export HPHP_HOME=`/bin/pwd`
+if [ "x${TRAVIS}" != "x" ]; then
+  # Collect some stats for use in tuning build later on
+  free
+  CPUS=`cat /proc/cpuinfo | grep -E '^processor' | tail -1 | cut -d : -f 2`
+  CPUS=`expr ${CPUS} + 1`
+  echo "CPUs: ${CPUS}"
+fi
 
-sudo apt-get install git-core cmake g++ libboost1.48-dev libmysqlclient-dev \
+export CMAKE_PREFIX_PATH=`/bin/pwd`/..
+
+# install python-software-properties before trying to add a PPA
+sudo apt-get -y update
+sudo apt-get install -y python-software-properties
+
+# install apt-fast to speed up later dependency installation
+sudo add-apt-repository -y ppa:apt-fast/stable
+sudo apt-get -y update
+sudo apt-get -y install apt-fast
+
+# install the actual dependencies
+sudo apt-fast -y update
+sudo apt-fast -y install git-core cmake g++ libboost1.48-dev libmysqlclient-dev \
   libxml2-dev libmcrypt-dev libicu-dev openssl build-essential binutils-dev \
   libcap-dev libgd2-xpm-dev zlib1g-dev libtbb-dev libonig-dev libpcre3-dev \
   autoconf libtool libcurl4-openssl-dev libboost-regex1.48-dev libboost-system1.48-dev \
-  libboost-program-options1.48-dev libboost-filesystem1.48-dev wget memcached \
-  libreadline-dev libncurses-dev libmemcached-dev libbz2-dev \
+  libboost-program-options1.48-dev libboost-filesystem1.48-dev libboost-thread1.48-dev \
+  wget memcached libreadline-dev libncurses-dev libmemcached-dev libbz2-dev \
   libc-client2007e-dev php5-mcrypt php5-imagick libgoogle-perftools-dev \
-  libcloog-ppl0 libelf-dev libdwarf-dev libunwind7-dev subversion
+  libcloog-ppl0 libelf-dev libdwarf-dev libunwind7-dev subversion &
+
+git clone git://github.com/libevent/libevent.git --quiet &
+git clone git://github.com/bagder/curl.git --quiet &
+svn checkout http://google-glog.googlecode.com/svn/trunk/ google-glog --quiet &
+wget http://www.canonware.com/download/jemalloc/jemalloc-3.0.0.tar.bz2 --quiet &
+
+# init submodules
+git submodule update --init
+
+# wait until all background processes finished
+FAIL=0
+
+for job in `jobs -p`
+do
+    echo "waiting for background job $job"
+    wait $job || let "FAIL+=1"
+done
+
+if [ "$FAIL" == "0" ];
+then
+    echo "all downloads finished"
+else
+    echo "$FAIL errors while downloading!"
+    exit 100
+fi 
+
+# Leave this install till after the main parallel package install above
+# since it adds a non-12.04 package repo and we don't want to
+# pull EVERYTHING in, just the newer gcc compiler (and toolchain)
+GCC_VER=4.7
+if [ "x${TRAVIS}" != "x" ]; then
+  GCC_VER=4.8
+fi
+sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo apt-get -y update
+sudo apt-get -y install gcc-${GCC_VER} g++-${GCC_VER}
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VER} 60 \
+                         --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VER}
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 40 \
+                         --slave /usr/bin/g++ g++ /usr/bin/g++-4.6
+sudo update-alternatives --set gcc /usr/bin/gcc-${GCC_VER}
 
 # libevent
-git clone git://github.com/libevent/libevent.git
 cd libevent
 git checkout release-1.4.14b-stable
 cat ../hphp/third_party/libevent-1.4.14.fb-changes.diff | patch -p1
 ./autogen.sh
 ./configure --prefix=$CMAKE_PREFIX_PATH
-make
+make -j $CPUS
 make install
 cd ..
 
 # curl
-git clone git://github.com/bagder/curl.git
 cd curl
 ./buildconf
 ./configure --prefix=$CMAKE_PREFIX_PATH
-make
+make -j $CPUS
 make install
 cd ..
 
 # glog
-svn checkout http://google-glog.googlecode.com/svn/trunk/ google-glog
 cd google-glog
 ./configure --prefix=$CMAKE_PREFIX_PATH
-make
+make -j $CPUS
 make install
 cd ..
 
 # jemaloc
-wget http://www.canonware.com/download/jemalloc/jemalloc-3.0.0.tar.bz2
 tar xjvf jemalloc-3.0.0.tar.bz2
 cd jemalloc-3.0.0
 ./configure --prefix=$CMAKE_PREFIX_PATH
-make
+make -j $CPUS
 make install
 cd ..
 
@@ -68,4 +123,4 @@ cmake .
 
 echo "-------------------------------------------------------------------------"
 echo "Done. Now run:"
-echo "  CMAKE_PREFIX_PATH=\`pwd\`/.. HPHP_HOME=\`pwd\` make"
+echo "  CMAKE_PREFIX_PATH=\`pwd\`/.. make"

hphp/.gitignore

@@ -0,0 +1,26 @@
+# HHVM build results
+*.hhbc
+*.[oa]
+/hhvm/hhvm
+/hhvm/hphp
+
+# vim swapfiles
+.*.swp
+.*.swo
+
+# tags files
+*/tags
+*/TAGS
+
+# logs
+*.log
+
+# git patch files
+*.diff
+
+# OS X
+.DS_Store
+._.DS_Store
+
+# gdb
+.gdb_history

hphp/CMakeLists.txt

@@ -16,42 +16,12 @@
 #
 
 include(HPHPSetup)
+include(FollySetup)
+include(ExtZendCompat)
 
-# HHVM Build
-SET(USE_HHVM TRUE)
-SET(ENV{HHVM} 1)
-ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"")
+add_definitions("-DHHVM")
 
-set(RECURSIVE_SOURCE_SUBDIRS runtime/base runtime/debugger runtime/eval runtime/ext runtime/vm util)
-foreach (dir ${RECURSIVE_SOURCE_SUBDIRS})
-
-	auto_sources(files "*.cpp" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
-	list(APPEND CXX_SOURCES ${files})
-
-	auto_sources(files "*.c" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
-	list(APPEND C_SOURCES ${files})
-
-	auto_sources(files "*.S" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
-	list(APPEND ASM_SOURCES ${files})
-endforeach(dir ${RECURSIVE_SOURCE_SUBDIRS})
-
-if(NOT LINUX)
-	add_definitions(-DNO_HARDWARE_COUNTERS)
-	list(REMOVE_ITEM CXX_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/runtime/vm/debug/elfwriter.cpp)
-endif()
-
-# remove ext_hhvm, and anything in a test folder
-foreach (file ${CXX_SOURCES})
-       	if (${file} MATCHES "ext_hhvm")
-		list(REMOVE_ITEM CXX_SOURCES ${file})
-	endif()
-	if (${file} MATCHES "/test/")
-		list(REMOVE_ITEM CXX_SOURCES ${file})
-	endif()
-endforeach(file ${CXX_SOURCES})
-
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+add_subdirectory(tools/bootstrap)
 
 add_subdirectory(third_party/libafdt)
 add_subdirectory(third_party/libmbfl)
@@ -60,43 +30,29 @@ add_subdirectory(third_party/timelib)
 add_subdirectory(third_party/lz4)
 add_subdirectory(third_party/double-conversion)
 add_subdirectory(third_party/folly)
+add_subdirectory(third_party/libzip)
+if(ENABLE_FASTCGI)
+	add_subdirectory(third_party/ti)
+	add_subdirectory(third_party/thrift)
+endif()
 
-foreach (CXX_FILE ${CXX_SOURCES})
-	if(${CXX_FILE} MATCHES ".no.cpp$")
-		SET_SOURCE_FILES_PROPERTIES(
-			${CXX_FILE}
-			PROPERTIES
-			COMPILE_FLAGS -O0
-		)
-	endif()
-endforeach()
-
-add_custom_command(
-  OUTPUT hphp_repo_schema.h hphp_build_info.cpp
-  COMMAND hphp/util/generate_buildinfo.sh
-  DEPENDS ${CXX_SOURCES} ${C_SOURCES}
-  WORKING_DIRECTORY ${HPHP_HOME}
-  COMMENT "Generating Repo Schema ID and Compiler ID"
-  VERBATIM)
-
-ADD_LIBRARY(hphp_runtime_static STATIC
-            hphp_repo_schema.h hphp_build_info.cpp
-            ${CXX_SOURCES} ${C_SOURCES} ${ASM_SOURCES})
-SET_TARGET_PROPERTIES(hphp_runtime_static PROPERTIES OUTPUT_NAME "hphp_runtime")
-SET_TARGET_PROPERTIES(hphp_runtime_static PROPERTIES PREFIX "lib")
-SET_TARGET_PROPERTIES(hphp_runtime_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-
-SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
-
-hphp_link(hphp_runtime_static)
-
-add_subdirectory("tools/bootstrap")
+add_subdirectory(vixl)
+add_subdirectory(neo)
+add_subdirectory(parser)
+add_subdirectory(zend)
+add_subdirectory(util)
 
+add_subdirectory(hhbbc)
 add_subdirectory(compiler)
+add_subdirectory(runtime)
 add_subdirectory(runtime/ext_hhvm)
-add_subdirectory(hhvm)
 add_subdirectory(system)
 
+add_subdirectory(hhvm)
+
 if (NOT "$ENV{HPHP_NOTEST}" STREQUAL "1")
 	add_subdirectory(test)
 endif ()
+
+# Keep this last
+add_subdirectory(tools/hphpize)

hphp/NEWS

@@ -0,0 +1,226 @@
+"D<something>"
+  - Deleted legacy register allocator and removed the -vEval.HHIRXls option
+
+"Coolio" 21-Jan-2014
+  - Turn on Region JIT
+  - FastCGI fixes, perf improvements
+  - ext_zend_compat fixes
+  - Turn on XLS Register Allocator by default
+  - Fix server stats reporting
+  - 'num' scalar typehint that accepts both ints and floats
+  - fix support for typedef'd namespaces
+  - don't swallow fatals when autoloading
+  - Map collections learned the in-place retain() and retainWithKey()
+  - rename Set::difference() to Set::removeAll()
+  - Update Set to retain element insertion order
+  - remove APC stats
+  - Fixes for ARM mode
+  - FrozenMap collection
+  - Deprecated Vector|Set|Map::put() method removed
+  - == between Frozen{Vector|Set|Map} and {Vector|Set|Map} now can return true
+
+"Beastie Boys" 6-Jan-2014
+  - Support lex-time binary constants (eg. 0b10111)
+  - StreamWrappers now support rmdir, mkdir, rename and unlink
+  - Miscellaneous Zend PHP compatibility fixes
+  - Default StatCache to off
+  - Miscellaneous FastCGI fixes
+  - Miscellaneous region compiler fixes
+  - Map and StableMap collections use the same underlying implementation
+  - Trait requirements enforced
+  - hhprof performance improvements
+  - Add array to string conversion notice
+  - Add RaiseNotice IR opcode
+  - Fix VirtualHost.<name>.Pattern matching
+  - Fix various memory leaks (pdo_parse_params, Gen*WaitHandle)
+  - Import a lot more Zend tests that used to crash or hang
+  - Clean up base.h
+  - XLS register allocation cleanup
+  - Enable region compiler by default for JIT functions in ahot
+  - Fatal on eval() in RepoAuthoritative mode
+  - Enable LTO for HHVM
+  - Fix a few SPL compatibility issues
+
+"Appleseed" 23-Dec-2013
+  - Fix issues with DOCUMENT_ROOT in fastcgi
+  - Better type inference for collections and builtins in repo mode
+  - Shorter syntax for lambda expressions w/ automatic captures
+  - Parser support for trait require clauses
+  - Move FrozenVector and Set to the HH namespace
+  - Fix resource to array conversion
+  - Fix a request local memory leak in foreach of apc arrays
+  - Initial php_odbc API implementation
+  - Implement PHP's hash_copy() function
+  - Experimental tool: Memoization Opportunity Profiler
+  - Various small parity/behavior fixes (in phar, proc_open, filter_var)
+  - A Eval.DumpHhas=1 option to dump hhas for a php file
+  - Better warnings in Set::toArray
+  - Fix the behavior of foreach loops in finally blocks
+  - chmod -x runtime/vm/jit/*.{cpp,h}
+  - Changes to make hhvm build clean with clang-3.4
+  - Fix array_product to not be bug-compatible with PHP 5.2
+  - Change the Map datastructure---preserves order and does faster foreach
+  - FrozenSet collection
+  - Generate pid.map when we unmap text section, for the perf tool
+  - Implemented GlobIterator
+  - Implemented Reflection::export and Reflection::getModifierNames
+
+"Tom Yum" 9-Dec-2013
+  - support date.timezone in ini files
+  - implement fileinfo
+  - special comparisons for DateTime
+  - delete unimplemented functions
+  - support for the finally clause in try blocks
+
+"Huarache" 26-Nov-2013
+  - Linker re-ordering of hot functions
+  - Huge pages for hot functions
+  - Implement ZipArchive
+  - preg_replace /e support
+  - get_mem_usage() no longer can be negative
+  - Userland file system support
+  - Implement fileinfo extension
+  - wordwrap() fixes
+  - PDO::sqliteCreateFunction()
+  - Implement NumberFormatter
+  - Implement Locale
+  - Implement DatePeriod
+  - Many reflection fixes
+  - Stub out PharData
+  - A ton of performance fixes
+  - A ton of open source framework fixes
+  - FastCGI Server Support
+
+"Garlic Alfredo" 11-Nov-2013
+  - teach implode() about collections
+  - fix ini parsing leak
+  - Make array not an instanceof Traversable
+
+"Burrito" 28-Oct-2013
+  - Initial support for using FastCGI
+  - Initial support for php.ini configuration files
+  - Log when a nullable (e.g. ?int) is incorrect
+  - Add support for collections to array_diff, array_diff_key, array_intersect,
+    array_intersect_key
+  - tc-print improvements and fixes
+  - Several debugger fixes
+  - More improvements to the experimental PHP extension compat layer
+  - Fixed how parse errors are handled by eval()
+  - Support custom reason for status header
+  - Emit better error message when hhvm's systemlib doesn't load properly
+  - Fixes / clarifications added to the bytecode specification
+  - Lots of other bug fixes, clean up, PHP compat fixes, and JIT improvements
+
+"Sausage" 14-Oct-2013
+  - Direct invocation of callable arrays: $f = [$cls_or_obj, 'method']; $f()
+  - ASAN clean
+  - Support dynamically loadable extensions
+  - Support loading mini-systemlibs from extensions
+
+"Tabasco" 30-Sep-2013
+  - Fix issues with __toString() functions that return non-string values
+  - Don't allow mock classes to extend collection classes
+  - Smarter memory allocation and scheduling for NUMA systems
+  - Improve profiler performance in the jit
+  - Fix several Zend compatibility issues
+  - Fix several bugs uncovered by ASAN
+  - Add collection support to array_keys, array_values, and array_combine
+  - Return a set-like array from Set::toArray
+  - Add to(Vector|Map|StableMap|Set) methods to collections
+  - Collections convert to boolean false when empty
+  - get_class_vars invokes the autoloader when necessary
+  - Rework the Zend compatibility layer to be more robust
+  - Allow traits to implement interfaces
+  - Support arbitrary expressions inside empty()
+
+"Bobotie" 16-Sep-2013
+  - HNI (HipHop Native Interface) for calling C++ functions from PHP
+  - Fix PropertyAccessorMap::isset
+  - Expose more POSIX constants
+  - Fixed behavior of stream_get_contents when default args are used.
+  - Implement str_getcsv, and fix some fgetcsv related issues.
+  - [IPv6] Fix stream_socket_recvfrom & stream_socket_sendto.
+  - [IPv6] Fix socket_sentto_recvfrom_ipv6_udp Zend compatibility.
+  - Optimize closure invocation and __invoke (~3x faster to invoke)
+  - Import gettext extension
+  - string and object allocation optimizations (reduced memory usage for both)
+  - Import YAML extension
+  - Import ftp extension
+
+"Kimchi" 2-Sep-2013
+  - Fix order of custom attributes and visibility in ctor arg promotion
+  - Implement CachingIterator
+  - Implement RecursiveCachingIterator
+  - Generalized heuristic for choosing when to inline in the jit
+  - Introduced a Zend compatibility layer to compile extensions
+  - Imported calendar extension
+  - Use gcc-4.8.1 by default
+  - Improve hhvm command line parsing logic
+  - Fix register_shutdown in session_set_save_handler to match PHP 5.4
+  - Add "native" functions for use in Systemlib
+  - PHP extension source-compatitblility layer
+  - Fix ArrayIterator constructor PHP compatibility
+  - Enable building against libmemcached 1.0.8
+  - Debugger: $_ not cleared but still printed after exception
+  - Fix clone of SplPriorityQueue
+  - Debugger: Fix bugs when multiple threads hit the same breakpoint
+  - Fix several namespace bugs
+  - Several PHP compatibility fixes for ArrayObject and ArrayIterator
+  - Fix list assignment with collection literals
+  - support "tuple(...)" in initializer expressions
+  - HHVM should compile with libmemcached 1.0.9+
+  - Support "(new Vector {..})->method()" style syntax
+  - use trigger_error in PHP for Redis user errors
+  - multiple simplexml fixes
+  - fixed serialize/unserialize for SplObjectStorage
+  - Implement ReflectionParameter::IsCallable()
+
+"Achiote" 19-Aug-2013
+  - Async stack traces in the debugger via the "wa" command
+  - Fix late static binding in static closures
+  - Fix breakpoints on generators
+  - Add SplObserver and SplSubject interfaces
+  - Update Iterable interface and add toArray() method
+  - Allow __get for undefined properties
+  - Implement get_included_files()
+  - Limit use of huge pages
+
+"Churrasco" 05-Aug-2013
+  - Implement stream_is_local
+  - Implement read support for .phar
+  - Implement assert with string arguments
+  - Implement RecursiveArrayIterator
+  - Implement php_strip_whitespace()
+  - Support for timeouts in cli mode
+  - Closure allocation optimizations (~2x faster to allocate a closure)
+  - Implement Redis session handler
+  - New memory profiler, hhprof, with pprof compatible output
+  - Update isset($string[$k]) and empty($string[$k) to PHP 5.5 semantics
+  - Fixed a few parser bugs
+  - Fixed a few bugs with token_get_all()
+  - Fix (string)$obj semantics when __toString() is not defined
+
+"Tamale" 22-Jul-2013
+  - Optimize vector-shaped Arrays (arrays with keys in range 0..size-1)
+  - Enable HHBC by default in debug builds
+  - Implement SplObjectStorage::getInfo()
+  - Initial rough draft of xhpast2, a replacement for xhpast
+  - fix compilation on Ubuntu 13.04
+  - OSX changes, next round
+  - Modify PHP's ext/standard/math/tests/(pow|abs).phpt to be HHVM friendly
+  - add XHP comment syntax based on http://www.w3.org/TR/REC-xml/#sec-comments
+
+"Wasabi Peas" 08-Jul-2013
+  - always_assert when we run out of TC space
+  - Initial changes to get HHVM compiling on OSX
+  - Consolidate ObjectData and Instance
+  - Prototype heap tracing framework & Heap profiler
+  - Better JIT code generation for Mod and Div
+  - Fixes to enable compilation with clang
+  - Support for yield k => v
+  - Make HHVM's command line parsing closer to PHP
+  - Implement Redis extension
+  - Implement LimitIterator from SPL
+  - add SessionHandler from PHP 5.4
+  - Numerous Debugger fixes and new developer docs for Debugger
+  - Ported many extension tests to PHP

hphp/compiler/CMakeLists.txt

@@ -49,3 +49,4 @@ add_definitions(-DALWAYS_ASSERT=1)
 
 ADD_LIBRARY(hphp_analysis STATIC ${CXX_SOURCES} ${C_SOURCES})
 target_link_libraries(hphp_analysis ${Boost_LIBRARIES})
+add_dependencies(hphp_analysis hphp_parser)

hphp/compiler/analysis/alias_manager.cpp

@@ -28,14 +28,14 @@
 #include "hphp/compiler/expression/simple_variable.h"
 #include "hphp/compiler/expression/scalar_expression.h"
 #include "hphp/compiler/expression/simple_function_call.h"
-#include "hphp/compiler/expression/array_element_expression.h"
 #include "hphp/compiler/expression/object_property_expression.h"
 #include "hphp/compiler/expression/object_method_expression.h"
 #include "hphp/compiler/expression/parameter_expression.h"
 #include "hphp/compiler/expression/expression_list.h"
-#include "hphp/compiler/expression/expression.h"
 #include "hphp/compiler/expression/include_expression.h"
 #include "hphp/compiler/expression/closure_expression.h"
+#include "hphp/compiler/expression/yield_expression.h"
+#include "hphp/compiler/expression/await_expression.h"
 #include "hphp/compiler/statement/statement.h"
 #include "hphp/compiler/statement/statement_list.h"
 #include "hphp/compiler/statement/catch_statement.h"
@@ -64,14 +64,14 @@
 #include "hphp/compiler/analysis/live_dict.h"
 #include "hphp/compiler/analysis/ref_dict.h"
 
-#include "hphp/runtime/base/builtin_functions.h"
+#include "hphp/runtime/vm/runtime.h"
 
-#include "hphp/util/parser/hphp.tab.hpp"
-#include "hphp/util/parser/location.h"
+#include "hphp/parser/hphp.tab.hpp"
+#include "hphp/parser/location.h"
 #include "hphp/util/util.h"
 
-#define spc(T,p) boost::static_pointer_cast<T>(p)
-#define dpc(T,p) boost::dynamic_pointer_cast<T>(p)
+#define spc(T,p) static_pointer_cast<T>(p)
+#define dpc(T,p) dynamic_pointer_cast<T>(p)
 
 using namespace HPHP;
 using std::string;
@@ -746,15 +746,6 @@ void AliasManager::killLocals() {
         goto kill_it;
 
       case Expression::KindOfBinaryOpExpression:
-        if (!(effects & emask) &&
-            getOpForAssignmentOp(spc(BinaryOpExpression, e)->getOp())) {
-          if (okToKill(spc(BinaryOpExpression, e)->getExp1(), false)) {
-            e->setContext(Expression::DeadStore);
-            m_replaced++;
-            ++it;
-            continue;
-          }
-        }
         cleanInterf(spc(BinaryOpExpression, e)->getExp1(), ++it, end, depth);
         continue;
 
@@ -1526,8 +1517,7 @@ ExpressionPtr AliasManager::canonicalizeNode(
             e->is(Expression::KindOfSimpleVariable) &&
             !e->isThis()) {
           Symbol *s = spc(SimpleVariable, e)->getSymbol();
-          if (s && !s->isParameter() && !s->isGeneratorParameter() &&
-              !s->isClosureVar()) {
+          if (s && !s->isParameter() && !s->isClosureVar()) {
             rep = e->makeConstant(m_arp, "null");
             Compiler::Error(Compiler::UseUndeclaredVariable, e);
             if (m_variables->getAttribute(VariableTable::ContainsCompact)) {
@@ -1587,6 +1577,7 @@ ExpressionPtr AliasManager::canonicalizeNode(
               cur = next;
             }
             if (!m_inCall &&
+                !last->is(Expression::KindOfAwaitExpression) &&
                 !last->is(Expression::KindOfYieldExpression) &&
                 ae->isUnused() && m_accessList.isLast(ae) &&
                 !e->hasAnyContext(Expression::AccessContext |
@@ -1934,6 +1925,7 @@ StatementPtr AliasManager::canonicalizeRecur(StatementPtr s, int &ret) {
 
   switch (stype) {
   case Statement::KindOfUseTraitStatement:
+  case Statement::KindOfTraitRequireStatement:
   case Statement::KindOfTraitPrecStatement:
   case Statement::KindOfTraitAliasStatement:
     return StatementPtr();
@@ -1975,7 +1967,7 @@ StatementPtr AliasManager::canonicalizeRecur(StatementPtr s, int &ret) {
   }
 
   case Statement::KindOfIfBranchStatement:
-    always_assert(0);
+    always_assert(false);
     break;
 
   case Statement::KindOfForStatement: {
@@ -2367,9 +2359,6 @@ int AliasManager::collectAliasInfoRecur(ConstructPtr cs, bool unused) {
       case Expression::KindOfSimpleFunctionCall:
       {
         SimpleFunctionCallPtr sfc(spc(SimpleFunctionCall, e));
-        if (sfc->getName() == "hphp_create_continuation") {
-          m_inlineAsExpr = false;
-        }
         sfc->updateVtFlags();
       }
       case Expression::KindOfDynamicFunctionCall:
@@ -2540,8 +2529,10 @@ public:
   }
 private:
 
-  #define CONSTRUCT_PARAMS(from) \
+  #define CONSTRUCT_EXP(from) \
       (from)->getScope(), (from)->getLocation()
+  #define CONSTRUCT_STMT(from) \
+      (from)->getScope(), (from)->getLabelScope(), (from)->getLocation()
 
   AnalysisResultConstPtr m_ar;
   bool m_changed;
@@ -2614,7 +2605,7 @@ private:
 
     ExpressionListPtr el(
         new ExpressionList(
-          CONSTRUCT_PARAMS(target),
+          CONSTRUCT_EXP(target),
           ExpressionList::ListKindComma));
     if (target->isUnused()) {
       el->setUnused(true);
@@ -2640,8 +2631,11 @@ private:
     if (sv && se) {
       const string &s = se->getLiteralString();
       if (s.empty()) return ExpressionPtr();
-      if (interface_supports_array(s)) {
-        // This could be an array, so don't assert anything
+      if (interface_supports_array(s) ||
+          interface_supports_string(s) ||
+          interface_supports_int(s) ||
+          interface_supports_double(s))  {
+        // This could be a primitive type, so don't assert anything
         return ExpressionPtr();
       }
       TypePtr o(Type::CreateObjectType(Util::toLower(s)));
@@ -2955,7 +2949,7 @@ private:
         slistPtr->insertElement(
           ExpStatementPtr(
             new ExpStatement(
-              CONSTRUCT_PARAMS(slistPtr), assertion)),
+              CONSTRUCT_STMT(slistPtr), assertion)),
           idx);
       }
       break;
@@ -3036,12 +3030,12 @@ private:
                   } else {
                     ExpStatementPtr newExpStmt(
                       new ExpStatement(
-                        CONSTRUCT_PARAMS(branch),
+                        CONSTRUCT_STMT(branch),
                         after));
 
                     IfBranchStatementPtr newBranch(
                       new IfBranchStatement(
-                        CONSTRUCT_PARAMS(branch),
+                        CONSTRUCT_STMT(branch),
                         ExpressionPtr(), newExpStmt));
 
                     branches->addElement(newBranch);
@@ -3308,6 +3302,12 @@ private:
 static bool isNewResult(ExpressionPtr e) {
   if (!e) return false;
   if (e->is(Expression::KindOfNewObjectExpression)) return true;
+  if (e->is(Expression::KindOfBinaryOpExpression)) {
+    auto b = spc(BinaryOpExpression, e);
+    if (b->getOp() == T_COLLECTION) {
+      return true;
+    }
+  }
   if (e->is(Expression::KindOfAssignmentExpression)) {
     return isNewResult(spc(AssignmentExpression, e)->getValue());
   }
@@ -3327,19 +3327,12 @@ public:
     DataFlowWalker::walk(*this);
     ControlBlock *b = m_graph.getDfBlock(1);
     std::map<std::string,int>::iterator it = m_gidMap.find("v:this");
-    if (m->getOrigGeneratorFunc()) {
-      BitOps::set(m_gidMap.size(), b->getRow(DataFlow::PRefIn),
-                  BitOps::Bits(-1));
-      BitOps::set(m_gidMap.size(), b->getRow(DataFlow::PInitIn),
-                  BitOps::Bits(-1));
-    } else {
-      if (it != m_gidMap.end() && it->second) {
-        b->setBit(DataFlow::PRefIn, it->second);
-        b->setBit(DataFlow::PInitIn, it->second);
-      }
-      updateParamInfo(m->getParams(), Option::HardTypeHints);
-      updateParamInfo(m->getFunctionScope()->getClosureVars(), false);
+    if (it != m_gidMap.end() && it->second) {
+      b->setBit(DataFlow::PRefIn, it->second);
+      b->setBit(DataFlow::PInitIn, it->second);
     }
+    updateParamInfo(m->getParams(), Option::HardTypeHints);
+    updateParamInfo(m->getFunctionScope()->getClosureVars(), false);
   }
 
   void updateParamInfo(ExpressionListPtr el, bool useDefaults) {
@@ -3579,25 +3572,6 @@ public:
       }
     }
 
-    if (auto rs = dynamic_pointer_cast<ReturnStatement>(cp)) {
-      std::vector<std::string> lnames;
-      VariableTableConstPtr vars = cp->getFunctionScope()->getVariables();
-      vars->getLocalVariableNames(lnames);
-      for (auto& l : lnames) {
-        int id = m_gidMap["v:" + l];
-        if (id && !m_block->getBit(DataFlow::PInitOut, id)) {
-          rs->addNonRefcounted(l);
-        } else {
-          auto sym = vars->getSymbol(l);
-          auto dt = vars->getFinalType(l)->getDataType();
-          if (!sym->isStatic()
-              && !IS_REFCOUNTED_TYPE(dt) && dt != KindOfUnknown) {
-            rs->addNonRefcounted(l);
-          }
-        }
-      }
-    }
-
     return DataFlowWalker::after(cp);
   }
 private:
@@ -3613,7 +3587,7 @@ public:
 
   bool walk() { ControlFlowGraphWalker::walk(*this); return m_changed; }
   int afterEach(ConstructRawPtr p, int i, ConstructPtr kid) {
-    if (ExpressionRawPtr e = boost::dynamic_pointer_cast<Expression>(kid)) {
+    if (ExpressionRawPtr e = dynamic_pointer_cast<Expression>(kid)) {
       if (e->isTypeAssertion()) return WalkContinue; // nothing to do
 
       bool safeForProp =

hphp/compiler/analysis/analysis_result.cpp

@@ -32,6 +32,7 @@
 #include "hphp/compiler/statement/loop_statement.h"
 #include "hphp/compiler/statement/class_variable.h"
 #include "hphp/compiler/statement/use_trait_statement.h"
+#include "hphp/compiler/statement/trait_require_statement.h"
 #include "hphp/compiler/analysis/symbol_table.h"
 #include "hphp/compiler/package.h"
 #include "hphp/compiler/parser/parser.h"
@@ -46,14 +47,14 @@
 #include "hphp/compiler/expression/array_pair_expression.h"
 #include "hphp/compiler/expression/simple_function_call.h"
 #include "hphp/runtime/ext/ext_json.h"
-#include "hphp/runtime/base/zend/zend_printf.h"
-#include "hphp/runtime/base/program_functions.h"
+#include "hphp/runtime/base/zend-printf.h"
+#include "hphp/runtime/base/program-functions.h"
 #include "hphp/util/atomic.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/util.h"
 #include "hphp/util/hash.h"
 #include "hphp/util/process.h"
-#include "hphp/util/job_queue.h"
+#include "hphp/util/job-queue.h"
 #include "hphp/util/timer.h"
 
 using namespace HPHP;
@@ -456,8 +457,10 @@ void AnalysisResult::markRedeclaringClasses() {
    * as redeclaring for now.
    */
   for (auto& kv : m_classAliases) {
-    markRedeclaring(Util::toLower(kv.first));
-    markRedeclaring(Util::toLower(kv.second));
+    assert(kv.first == Util::toLower(kv.first));
+    assert(kv.second == Util::toLower(kv.second));
+    markRedeclaring(kv.first);
+    markRedeclaring(kv.second);
   }
 
   /*
@@ -467,7 +470,8 @@ void AnalysisResult::markRedeclaringClasses() {
    * that things like 'instanceof Foo' will not mean the same thing.
    */
   for (auto& name : m_typeAliasNames) {
-    markRedeclaring(Util::toLower(name));
+    assert(Util::toLower(name) == name);
+    markRedeclaring(name);
   }
 }
 
@@ -485,8 +489,7 @@ void AnalysisResult::link(FileScopePtr user, FileScopePtr provider) {
 
 bool AnalysisResult::addClassDependency(FileScopePtr usingFile,
                                         const std::string &className) {
-  if (BuiltinSymbols::s_classes.find(className) !=
-      BuiltinSymbols::s_classes.end())
+  if (m_systemClasses.find(className) != m_systemClasses.end())
     return true;
 
   StringToClassScopePtrVecMap::const_iterator iter =
@@ -504,8 +507,7 @@ bool AnalysisResult::addClassDependency(FileScopePtr usingFile,
 
 bool AnalysisResult::addFunctionDependency(FileScopePtr usingFile,
                                            const std::string &functionName) {
-  if (BuiltinSymbols::s_functions.find(functionName) !=
-      BuiltinSymbols::s_functions.end())
+  if (m_functions.find(functionName) != m_functions.end())
     return true;
   StringToFunctionScopePtrMap::const_iterator iter =
     m_functionDecs.find(functionName);
@@ -567,12 +569,16 @@ bool AnalysisResult::isSystemConstant(const std::string &constName) const {
 ///////////////////////////////////////////////////////////////////////////////
 // Program
 
-void AnalysisResult::loadBuiltins() {
-  AnalysisResultPtr ar = shared_from_this();
-  BuiltinSymbols::LoadFunctions(ar, m_functions);
-  BuiltinSymbols::LoadClasses(ar, m_systemClasses);
-  BuiltinSymbols::LoadVariables(ar, m_variables);
-  BuiltinSymbols::LoadConstants(ar, m_constants);
+void AnalysisResult::addSystemFunction(FunctionScopeRawPtr fs) {
+  FunctionScopePtr& entry = m_functions[fs->getName()];
+  assert(!entry);
+  entry = fs;
+}
+
+void AnalysisResult::addSystemClass(ClassScopeRawPtr cs) {
+  ClassScopePtr& entry = m_systemClasses[cs->getName()];
+  assert(!entry);
+  entry = cs;
 }
 
 void AnalysisResult::checkClassDerivations() {
@@ -584,7 +590,11 @@ void AnalysisResult::checkClassDerivations() {
       hphp_string_iset seen;
       cls->checkDerivation(ar, seen);
       if (Option::WholeProgram) {
-        cls->importUsedTraits(ar);
+        try {
+          cls->importUsedTraits(ar);
+        } catch (const AnalysisTimeFatalException& e) {
+          cls->setFatal(e);
+        }
       }
     }
   }
@@ -602,22 +612,26 @@ void AnalysisResult::resolveNSFallbackFuncs() {
 }
 
 void AnalysisResult::collectFunctionsAndClasses(FileScopePtr fs) {
-  const StringToFunctionScopePtrMap &funcs = fs->getFunctions();
-
-  for (StringToFunctionScopePtrMap::const_iterator iter = funcs.begin();
-       iter != funcs.end(); ++iter) {
-    FunctionScopePtr func = iter->second;
+  for (const auto& iter : fs->getFunctions()) {
+    FunctionScopePtr func = iter.second;
     if (!func->inPseudoMain()) {
-      FunctionScopePtr &funcDec = m_functionDecs[iter->first];
+      FunctionScopePtr &funcDec = m_functionDecs[iter.first];
       if (funcDec) {
-        FunctionScopePtrVec &funcVec = m_functionReDecs[iter->first];
-        int sz = funcVec.size();
-        if (!sz) {
-          funcDec->setRedeclaring(sz++);
-          funcVec.push_back(funcDec);
+        if (funcDec->isSystem()) {
+          assert(funcDec->allowOverride());
+          funcDec = func;
+        } else if (func->isSystem()) {
+          assert(func->allowOverride());
+        } else {
+          FunctionScopePtrVec &funcVec = m_functionReDecs[iter.first];
+          int sz = funcVec.size();
+          if (!sz) {
+            funcDec->setRedeclaring(sz++);
+            funcVec.push_back(funcDec);
+          }
+          func->setRedeclaring(sz++);
+          funcVec.push_back(func);
         }
-        func->setRedeclaring(sz++);
-        funcVec.push_back(func);
       } else {
         funcDec = func;
       }
@@ -625,13 +639,12 @@ void AnalysisResult::collectFunctionsAndClasses(FileScopePtr fs) {
   }
 
   if (const StringToFunctionScopePtrVecMap *redec = fs->getRedecFunctions()) {
-    for (StringToFunctionScopePtrVecMap::const_iterator iter = redec->begin();
-         iter != redec->end(); ++iter) {
-      FunctionScopePtrVec::const_iterator i = iter->second.begin();
-      FunctionScopePtrVec::const_iterator e = iter->second.end();
-      FunctionScopePtr &funcDec = m_functionDecs[iter->first];
+    for (const auto &iter : *redec) {
+      FunctionScopePtrVec::const_iterator i = iter.second.begin();
+      FunctionScopePtrVec::const_iterator e = iter.second.end();
+      FunctionScopePtr &funcDec = m_functionDecs[iter.first];
       assert(funcDec); // because the first one was in funcs above
-      FunctionScopePtrVec &funcVec = m_functionReDecs[iter->first];
+      FunctionScopePtrVec &funcVec = m_functionReDecs[iter.first];
       int sz = funcVec.size();
       if (!sz) {
         funcDec->setRedeclaring(sz++);
@@ -644,11 +657,9 @@ void AnalysisResult::collectFunctionsAndClasses(FileScopePtr fs) {
     }
   }
 
-  const StringToClassScopePtrVecMap &classes = fs->getClasses();
-  for (StringToClassScopePtrVecMap::const_iterator iter = classes.begin();
-       iter != classes.end(); ++iter) {
-    ClassScopePtrVec &clsVec = m_classDecs[iter->first];
-    clsVec.insert(clsVec.end(), iter->second.begin(), iter->second.end());
+  for (const auto& iter : fs->getClasses()) {
+    ClassScopePtrVec &clsVec = m_classDecs[iter.first];
+    clsVec.insert(clsVec.end(), iter.second.begin(), iter.second.end());
   }
 
   m_classAliases.insert(fs->getClassAliases().begin(),
@@ -964,11 +975,14 @@ struct OptVisitor {
 
   AnalysisResultPtr m_ar;
   unsigned m_nscope;
-  JobQueueDispatcher<BlockScope *, OptWorker<When> > *m_dispatcher;
+  JobQueueDispatcher<OptWorker<When>> *m_dispatcher;
 };
 
 template <typename When>
-class OptWorker : public JobQueueWorker<BlockScope *, true, true> {
+class OptWorker : public JobQueueWorker<BlockScope*,
+                                        void*,
+                                        true,
+                                        true> {
 public:
   OptWorker() {}
 
@@ -980,15 +994,15 @@ public:
 
   virtual void doJob(BlockScope *scope) {
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-    atomic_inc(AnalysisResult::s_NumDoJobCalls);
+    ++AnalysisResult::s_NumDoJobCalls;
     ConcurrentBlockScopeRawPtrIntHashMap::accessor acc;
     AnalysisResult::s_DoJobUniqueScopes.insert(acc,
       BlockScopeRawPtr(scope));
     acc->second += 1;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
     try {
-      DepthFirstVisitor<When, OptVisitor > *visitor =
-        (DepthFirstVisitor<When, OptVisitor >*)m_opaque;
+      auto visitor =
+        (DepthFirstVisitor<When, OptVisitor>*) m_context;
       {
         Lock ldep(BlockScope::s_depsMutex);
         Lock lstate(BlockScope::s_jobStateMutex);
@@ -1040,13 +1054,13 @@ public:
                 break;
               case BlockScope::MarkProcessing:
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-                atomic_inc(AnalysisResult::s_NumForceRerunGlobal);
+                ++AnalysisResult::s_NumForceRerunGlobal;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
                 pf->first->setForceRerun(true);
                 break;
               case BlockScope::MarkProcessed:
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-                atomic_inc(AnalysisResult::s_NumReactivateGlobal);
+                ++AnalysisResult::s_NumReactivateGlobal;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
                 if (visitor->activateScope(pf->first)) {
                   visitor->enqueue(pf->first);
@@ -1082,7 +1096,7 @@ public:
               int m = pf->first->getMark();
               if (pf->second & useKinds && m == BlockScope::MarkProcessed) {
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-                atomic_inc(AnalysisResult::s_NumReactivateUseKinds);
+                ++AnalysisResult::s_NumReactivateUseKinds;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
                 bool ready = visitor->activateScope(pf->first);
                 always_assert(!ready);
@@ -1106,7 +1120,7 @@ public:
                 // in its entirety. Thus, we must force it to run again in
                 // order to be able to observe all the updates.
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-                atomic_inc(AnalysisResult::s_NumForceRerunUseKinds);
+                ++AnalysisResult::s_NumForceRerunUseKinds;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
                 always_assert(pf->first->getNumDepsToWaitFor() == 0);
                 pf->first->setForceRerun(true);
@@ -1177,7 +1191,7 @@ void OptWorker<Pre>::onThreadExit() {
     } \
     if (threadCount <= 0) threadCount = 1; \
     this->m_data.m_dispatcher = \
-      new JobQueueDispatcher<BlockScope *, worker >( \
+      new JobQueueDispatcher<worker>( \
         threadCount, true, 0, false, this); \
   } while (0)
 
@@ -1222,7 +1236,7 @@ template <typename When>
 void
 AnalysisResult::preWaitCallback(bool first,
                                 const BlockScopeRawPtrQueue &scopes,
-                                void *opaque) {
+                                void *context) {
   // default is no-op
 }
 
@@ -1231,17 +1245,17 @@ bool
 AnalysisResult::postWaitCallback(bool first,
                                  bool again,
                                  const BlockScopeRawPtrQueue &scopes,
-                                 void *opaque) {
+                                 void *context) {
   // default is no-op
   return again;
 }
 
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-int AnalysisResult::s_NumDoJobCalls         = 0;
-int AnalysisResult::s_NumForceRerunGlobal   = 0;
-int AnalysisResult::s_NumReactivateGlobal   = 0;
-int AnalysisResult::s_NumForceRerunUseKinds = 0;
-int AnalysisResult::s_NumReactivateUseKinds = 0;
+std::atomic<int> AnalysisResult::s_NumDoJobCalls(0);
+std::atomic<int> AnalysisResult::s_NumForceRerunGlobal(0);
+std::atomic<int> AnalysisResult::s_NumReactivateGlobal(0);
+std::atomic<int> AnalysisResult::s_NumForceRerunUseKinds(0);
+std::atomic<int> AnalysisResult::s_NumReactivateUseKinds(0);
 
 ConcurrentBlockScopeRawPtrIntHashMap
   AnalysisResult::s_DoJobUniqueScopes;
@@ -1296,7 +1310,7 @@ struct BIPairCmp {
 template <typename When>
 void
 AnalysisResult::processScopesParallel(const char *id,
-                                      void *opaque /* = NULL */) {
+                                      void *context /* = NULL */) {
   BlockScopeRawPtrQueue scopes;
   getScopesSet(scopes);
 
@@ -1333,7 +1347,7 @@ AnalysisResult::processScopesParallel(const char *id,
 
     BlockScopeRawPtrQueue enqueued;
     again = dfv.visitParallel(scopes, first, enqueued);
-    preWaitCallback<When>(first, scopes, opaque);
+    preWaitCallback<When>(first, scopes, context);
 
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
     {
@@ -1387,7 +1401,7 @@ AnalysisResult::processScopesParallel(const char *id,
     std::cout << "Number of waiting scopes: " << numWaiting << std::endl;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
 
-    again = postWaitCallback<When>(first, again, scopes, opaque);
+    again = postWaitCallback<When>(first, again, scopes, context);
     first = false;
   } while (again);
   dfv.data().stop();
@@ -1516,7 +1530,7 @@ DepthFirstVisitor<InferTypes, OptVisitor>::visitScope(BlockScopeRawPtr scope) {
         // there are potentially AST nodes which are interested in the updated
         // return type
 #ifdef HPHP_INSTRUMENT_TYPE_INF
-        atomic_inc(RescheduleException::s_NumForceRerunSelfCaller);
+        ++RescheduleException::s_NumForceRerunSelfCaller;
 #endif /* HPHP_INSTRUMENT_TYPE_INF */
         scope->setForceRerun(true);
       }
@@ -1533,7 +1547,7 @@ DepthFirstVisitor<InferTypes, OptVisitor>::visitScope(BlockScopeRawPtr scope) {
     // potential deadlock detected- reschedule
     // this scope to run at a later time
 #ifdef HPHP_INSTRUMENT_TYPE_INF
-    atomic_inc(RescheduleException::s_NumReschedules);
+    ++RescheduleException::s_NumReschedules;
 #endif /* HPHP_INSTRUMENT_TYPE_INF */
     ret |= scope->getUpdated();
     if (m) {
@@ -1559,7 +1573,8 @@ DepthFirstVisitor<InferTypes, OptVisitor>::visitScope(BlockScopeRawPtr scope) {
 
 template<>
 bool AnalysisResult::postWaitCallback<InferTypes>(
-    bool first, bool again, const BlockScopeRawPtrQueue &scopes, void *opaque) {
+    bool first, bool again,
+    const BlockScopeRawPtrQueue &scopes, void *context) {
 
 #ifdef HPHP_INSTRUMENT_TYPE_INF
   std::cout << "Number of rescheduled: " <<
@@ -1590,9 +1605,9 @@ bool AnalysisResult::postWaitCallback<InferTypes>(
 }
 
 #ifdef HPHP_INSTRUMENT_TYPE_INF
-int RescheduleException::s_NumReschedules          = 0;
-int RescheduleException::s_NumForceRerunSelfCaller = 0;
-int RescheduleException::s_NumRetTypesChanged      = 0;
+std::atomic<int> RescheduleException::s_NumReschedules(0);
+std::atomic<int> RescheduleException::s_NumForceRerunSelfCaller(0);
+std::atomic<int> RescheduleException::s_NumRetTypesChanged(0);
 LProfileMap BaseTryLock::s_LockProfileMap;
 #endif /* HPHP_INSTRUMENT_TYPE_INF */
 
@@ -1601,12 +1616,10 @@ void AnalysisResult::inferTypes() {
   BlockScopeRawPtrQueue scopes;
   getScopesSet(scopes);
 
-  for (BlockScopeRawPtrQueue::iterator
-       it = scopes.begin(), end = scopes.end();
-       it != end; ++it) {
-    (*it)->setInTypeInference(true);
-    (*it)->clearUpdated();
-    assert((*it)->getNumDepsToWaitFor() == 0);
+  for (auto scope : scopes) {
+    scope->setInTypeInference(true);
+    scope->clearUpdated();
+    assert(scope->getNumDepsToWaitFor() == 0);
   }
 
 #ifdef HPHP_INSTRUMENT_TYPE_INF
@@ -1617,13 +1630,11 @@ void AnalysisResult::inferTypes() {
 
   processScopesParallel<InferTypes>("InferTypes");
 
-  for (BlockScopeRawPtrQueue::iterator
-       it = scopes.begin(), end = scopes.end();
-       it != end; ++it) {
-    (*it)->setInTypeInference(false);
-    (*it)->clearUpdated();
-    assert((*it)->getMark() == BlockScope::MarkProcessed);
-    assert((*it)->getNumDepsToWaitFor() == 0);
+  for (auto scope : scopes) {
+    scope->setInTypeInference(false);
+    scope->clearUpdated();
+    assert(scope->getMark() == BlockScope::MarkProcessed);
+    assert(scope->getNumDepsToWaitFor() == 0);
   }
 }
 
@@ -1665,12 +1676,12 @@ StatementPtr DepthFirstVisitor<Post, OptVisitor>::visit(StatementPtr stmt) {
   return stmt->postOptimize(this->m_data.m_ar);
 }
 
-class FinalWorker : public JobQueueWorker<MethodStatementPtr> {
+class FinalWorker : public JobQueueWorker<MethodStatementPtr, AnalysisResult*> {
 public:
   virtual void doJob(MethodStatementPtr m) {
     try {
       AliasManager am(1);
-      am.finalSetup(((AnalysisResult*)m_opaque)->shared_from_this(), m);
+      am.finalSetup(m_context->shared_from_this(), m);
     } catch (Exception &e) {
       Logger::Error("%s", e.getMessage().c_str());
     }
@@ -1679,11 +1690,11 @@ public:
 
 template<>
 void AnalysisResult::preWaitCallback<Post>(
-    bool first, const BlockScopeRawPtrQueue &scopes, void *opaque) {
-  assert(!Option::ControlFlow || opaque != nullptr);
+    bool first, const BlockScopeRawPtrQueue &scopes, void *context) {
+  assert(!Option::ControlFlow || context != nullptr);
   if (first && Option::ControlFlow) {
-    JobQueueDispatcher<FinalWorker::JobType, FinalWorker> *dispatcher
-      = (JobQueueDispatcher<FinalWorker::JobType, FinalWorker> *) opaque;
+    auto *dispatcher
+      = (JobQueueDispatcher<FinalWorker> *) context;
     for (BlockScopeRawPtrQueue::const_iterator it = scopes.begin(),
            end = scopes.end(); it != end; ++it) {
       BlockScopeRawPtr scope = *it;
@@ -1707,7 +1718,7 @@ void AnalysisResult::postOptimize() {
     }
     if (threadCount <= 0) threadCount = 1;
 
-    JobQueueDispatcher<FinalWorker::JobType, FinalWorker> dispatcher(
+    JobQueueDispatcher<FinalWorker> dispatcher(
       threadCount, true, 0, false, this);
 
     processScopesParallel<Post>("PostOptimize", &dispatcher);

hphp/compiler/analysis/analysis_result.h

@@ -24,19 +24,20 @@
 #include "hphp/compiler/analysis/symbol_table.h"
 #include "hphp/compiler/analysis/function_container.h"
 #include "hphp/compiler/package.h"
+#include "hphp/compiler/hphp.h"
 
-#include "hphp/util/string_bag.h"
-#include "hphp/util/thread_local.h"
+#include "hphp/util/string-bag.h"
+#include "hphp/util/thread-local.h"
 
 #include <boost/graph/adjacency_list.hpp>
-#include "tbb/concurrent_hash_map.h"
+#include <tbb/concurrent_hash_map.h>
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 
 DECLARE_BOOST_TYPES(ClassScope);
-DECLARE_BOOST_TYPES(FileScope);
+DECLARE_EXTENDED_BOOST_TYPES(FileScope);
 DECLARE_BOOST_TYPES(FunctionScope);
 DECLARE_BOOST_TYPES(Location);
 DECLARE_BOOST_TYPES(AnalysisResult);
@@ -150,7 +151,8 @@ public:
 
   void addNSFallbackFunc(ConstructPtr c, FileScopePtr fs);
 
-  void loadBuiltins();
+  void addSystemFunction(FunctionScopeRawPtr fs);
+  void addSystemClass(ClassScopeRawPtr cs);
   void analyzeProgram(bool system = false);
   void analyzeIncludes();
   void analyzeProgramFinal();
@@ -238,6 +240,14 @@ public:
   ClassScopePtr findClass(const std::string &className,
                           FindClassBy by);
 
+  /*
+   * Returns: whether the given name is the name of any type aliases
+   * in the whole program.
+   */
+  bool isTypeAliasName(const std::string& name) const {
+    return m_typeAliasNames.count(name);
+  }
+
   /**
    * Find all the redeclared classes by the name, excluding system classes.
    * Note that system classes cannot be redeclared.
@@ -335,12 +345,12 @@ private:
   std::string m_outputPath;
 public:
   AnalysisResultPtr shared_from_this() {
-    return boost::static_pointer_cast<AnalysisResult>
+    return static_pointer_cast<AnalysisResult>
       (BlockScope::shared_from_this());
   }
 
   AnalysisResultConstPtr shared_from_this() const {
-    return boost::static_pointer_cast<const AnalysisResult>
+    return static_pointer_cast<const AnalysisResult>
       (BlockScope::shared_from_this());
   }
 
@@ -396,12 +406,12 @@ public:
                               s_changedScopesMapThreadLocal);
 
 #ifdef HPHP_INSTRUMENT_PROCESS_PARALLEL
-  static int                                  s_NumDoJobCalls;
+  static std::atomic<int>                     s_NumDoJobCalls;
   static ConcurrentBlockScopeRawPtrIntHashMap s_DoJobUniqueScopes;
-  static int                                  s_NumForceRerunGlobal;
-  static int                                  s_NumReactivateGlobal;
-  static int                                  s_NumForceRerunUseKinds;
-  static int                                  s_NumReactivateUseKinds;
+  static std::atomic<int>                     s_NumForceRerunGlobal;
+  static std::atomic<int>                     s_NumReactivateGlobal;
+  static std::atomic<int>                     s_NumForceRerunUseKinds;
+  static std::atomic<int>                     s_NumReactivateUseKinds;
 #endif /* HPHP_INSTRUMENT_PROCESS_PARALLEL */
 
 private:
@@ -429,9 +439,9 @@ public:
     Exception(), m_scope(scope) {}
   BlockScopeRawPtr &getScope() { return m_scope; }
 #ifdef HPHP_INSTRUMENT_TYPE_INF
-  static int s_NumReschedules;
-  static int s_NumForceRerunSelfCaller;
-  static int s_NumRetTypesChanged;
+  static std::atomic<int> s_NumReschedules;
+  static std::atomic<int> s_NumForceRerunSelfCaller;
+  static std::atomic<int> s_NumRetTypesChanged;
 #endif /* HPHP_INSTRUMENT_TYPE_INF */
 private:
   BlockScopeRawPtr m_scope;

hphp/compiler/analysis/ast_walker.cpp

@@ -23,17 +23,17 @@ using namespace HPHP;
 
 bool FunctionWalker::SkipRecurse(ConstructPtr cp) {
   StatementPtr s(
-    boost::dynamic_pointer_cast<Statement>(cp));
+    dynamic_pointer_cast<Statement>(cp));
   return SkipRecurse(s);
 }
 bool FunctionWalker::SkipRecurse(ConstructConstPtr cp) {
   StatementConstPtr s(
-    boost::dynamic_pointer_cast<const Statement>(cp));
+    dynamic_pointer_cast<const Statement>(cp));
   return SkipRecurse(s);
 }
 bool FunctionWalker::SkipRecurse(ConstructRawPtr cp) {
   StatementRawPtr s(
-    boost::dynamic_pointer_cast<Statement>(cp));
+    dynamic_pointer_cast<Statement>(cp));
   return SkipRecurse(s);
 }
 

hphp/compiler/analysis/block_scope.cpp

@@ -14,10 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/compiler/expression/expression.h"
 
 #include "hphp/compiler/analysis/block_scope.h"
+
 #include "hphp/compiler/analysis/analysis_result.h"
+#include "hphp/compiler/expression/expression.h"
 #include "hphp/compiler/statement/statement_list.h"
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/analysis/constant_table.h"
@@ -94,7 +95,7 @@ FunctionScopeRawPtr BlockScope::getContainingNonClosureFunction() {
   // walk out through all the closures
   while (bs && bs->is(BlockScope::FunctionScope)) {
     HPHP::FunctionScope *fs = static_cast<HPHP::FunctionScope*>(bs);
-    if (!fs->isClosure() && !fs->isGeneratorFromClosure()) {
+    if (!fs->isClosure()) {
       return FunctionScopeRawPtr(fs);
     }
     bs = bs->m_outerScope.get();
@@ -154,9 +155,7 @@ bool BlockScope::hasUser(BlockScopeRawPtr user, int useKinds) const {
 }
 
 void BlockScope::addUse(BlockScopeRawPtr user, int useKinds) {
-  if (is(ClassScope) ? static_cast<HPHP::ClassScope*>(this)->isUserClass() :
-      is(FunctionScope) &&
-      static_cast<HPHP::FunctionScope*>(this)->isUserFunction()) {
+  if ((is(ClassScope) || is(FunctionScope)) && getStmt()) {
 
     if (user.get() == this) {
       m_selfUser |= useKinds;

hphp/compiler/analysis/block_scope.h

@@ -23,7 +23,7 @@
 #include "hphp/util/lock.h"
 #include "hphp/runtime/base/macros.h"
 
-#include "tbb/concurrent_hash_map.h"
+#include <tbb/concurrent_hash_map.h>
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@ typedef SimpleMutex InferTypesMutex;
  * Base class of ClassScope and FunctionScope.
  */
 class BlockScope : private boost::noncopyable,
-                   public boost::enable_shared_from_this<BlockScope> {
+                   public std::enable_shared_from_this<BlockScope> {
 public:
   enum KindOf {
     ClassScope,

hphp/compiler/analysis/capture_extractor.cpp

@@ -0,0 +1,391 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#include "hphp/compiler/analysis/capture_extractor.h"
+#include "hphp/compiler/expression/join_clause.h"
+#include "hphp/compiler/expression/scalar_expression.h"
+#include "hphp/parser/hphp.tab.hpp"
+
+namespace HPHP {
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Rewrites the construct rooted in cp so that it is in a form
+ * that a query processor can evaluate while referencing only
+ * state that is contained in the query processor or supplied
+ * to the query processor in the form of arguments to the query.
+ * For instance, a reference to a local variable in the scope
+ * containing the query expression will be rewritten into a
+ * reference to a (synthetic) parameter of the query expression.
+ * This is similar to the way lambda expressions capture variables
+ * from their enclosing environment.
+ * Note that rewriting implies allocating new objects.
+ * The original construct is not mutated in any way.
+ * If the original construct is already in the right form, it is
+ * returned as is.
+ */
+ExpressionPtr CaptureExtractor::rewrite(ExpressionPtr ep) {
+  assert(ep != nullptr);
+  switch (ep->getKindOf()) {
+    case Expression::KindOfQueryExpression: {
+      return rewriteQuery(static_pointer_cast<QueryExpression>(ep));
+    }
+    case Expression::KindOfSelectClause: {
+      // leave select clauses alone, another visitor deals with them.
+      return ep;
+    }
+    case Expression::KindOfFromClause:
+    case Expression::KindOfLetClause:
+    case Expression::KindOfIntoClause:
+    case Expression::KindOfWhereClause: {
+      return rewriteSimpleClause(static_pointer_cast<SimpleQueryClause>(ep));
+    }
+    case Expression::KindOfGroupClause:
+    case Expression::KindOfJoinClause:
+    case Expression::KindOfOrderbyClause:
+    case Expression::KindOfOrdering: {
+      // leave these alone. they are query specific and not parameterizable.
+      return ep;
+    }
+    case Expression::KindOfObjectPropertyExpression: {
+      return rewriteObjectProperty(
+        static_pointer_cast<ObjectPropertyExpression>(ep));
+    }
+    case Expression::KindOfSimpleFunctionCall: {
+      return rewriteCall(static_pointer_cast<SimpleFunctionCall>(ep));
+    }
+    case Expression::KindOfScalarExpression: {
+      // Leave scalars alone. If the query processor can't handle them
+      // rewriting won't help.
+      return ep;
+    }
+    case Expression::KindOfUnaryOpExpression: {
+      return rewriteUnary(static_pointer_cast<UnaryOpExpression>(ep));
+    }
+    case Expression::KindOfBinaryOpExpression: {
+      return rewriteBinary(static_pointer_cast<BinaryOpExpression>(ep));
+    }
+    case Expression::KindOfSimpleVariable: {
+      return rewriteSimpleVariable(static_pointer_cast<SimpleVariable>(ep));
+    }
+    case Expression::KindOfExpressionList: {
+      return rewriteExpressionList(static_pointer_cast<ExpressionList>(ep));
+    }
+    default: {
+      // If we get here, the expression is not a candidate for evaluation
+      // by the query processor, so just turn it into a query parameter.
+      return newQueryParamRef(ep);
+    }
+  }
+}
+
+/**
+ * Appends the given expression to end of the m_capturedExpressions list
+ * and creates a new expression with the same scope and source location
+ * that represents a reference to a query parameter. Query parameters do
+ * not have a source code equivalent, but inform the query processor that
+ * this expression represents the ith argument value, where i is zero based
+ * and forms the last character of the special string @query_param_i.
+ */
+SimpleVariablePtr CaptureExtractor::newQueryParamRef(ExpressionPtr ae) {
+  assert(ae != nullptr);
+  char count = '0' + m_capturedExpressions.size();
+  std::string pname = "@query_param_";
+  pname.push_back(count);
+  SimpleVariablePtr param(
+    new SimpleVariable(ae->getScope(), ae->getLocation(), pname)
+  );
+  m_capturedExpressions.push_back(ae);
+  return param;
+}
+
+/**
+ * If one or more of the arguments of the function call depend on query only
+ * state (query local but not a query parameter reference), then rewrite
+ * all of the arguments to be query local and return the rewritten
+ * function call (the query processor has to either figure out a way to call
+ * the function or must cause a runtime error when faced with the call).
+ * Otherwise, rewrite the call as a query parameter reference.
+ */
+ExpressionPtr CaptureExtractor::rewriteCall(SimpleFunctionCallPtr sfc) {
+  assert(sfc != nullptr);
+  if (sfc->hadBackslash() ||
+    (sfc->getClass() != nullptr && !sfc->getClassName().empty())) {
+    return newQueryParamRef(sfc);
+  }
+  auto args = sfc->getParams();
+  auto pc = args == nullptr ? 0 : args->getCount();
+  bool isQueryCall = false;
+  for (int i = 0; i < pc; i++) {
+    auto arg = (*args)[i];
+    assert(arg != nullptr);
+    isQueryCall |= this->dependsOnQueryOnlyState(arg);
+  }
+  if (!isQueryCall) return newQueryParamRef(sfc);
+  ExpressionListPtr newArgs(
+    new ExpressionList(args->getScope(), args->getLocation())
+  );
+  bool noRewrites = true;
+  for (int i = 0; i < pc; i++) {
+    auto arg = (*args)[i];
+    auto newArg = rewrite(arg);
+    if (arg != newArg) noRewrites = false;
+    newArgs->addElement(newArg);
+  }
+  if (noRewrites) return sfc;
+  SimpleFunctionCallPtr result(
+    new SimpleFunctionCall(sfc->getScope(), sfc->getLocation(),
+      sfc->getName(), false, newArgs, ExpressionPtr())
+  );
+  return result;
+}
+
+/**
+ * Traverses the expression tree rooted at e and returns true if
+ * any node in the tree is a simple variable that references a
+ * name in m_boundVars.
+ */
+bool CaptureExtractor::dependsOnQueryOnlyState(ExpressionPtr e) {
+  assert(e != nullptr);
+  if (e->getKindOf() == Expression::KindOfSimpleVariable) {
+    auto sv = static_pointer_cast<SimpleVariable>(e);
+    auto varName = sv->getName();
+    for (auto &boundVar : m_boundVars) {
+      if (varName == boundVar) return true;
+    }
+    return false;
+  }
+  auto numKids = e->getKidCount();
+  for (int i = 0; i < numKids; i++) {
+    auto ei = e->getNthExpr(i);
+    if (ei == nullptr) return false; //Default param
+    if (dependsOnQueryOnlyState(ei)) return true;
+  }
+  return false;
+}
+
+/**
+ * If a simple variable refers to a name bound inside the query
+ * then leave it alone. If not, rewrite it to be reference to
+ * a query parameter.
+ */
+SimpleVariablePtr CaptureExtractor::rewriteSimpleVariable(
+  SimpleVariablePtr sv) {
+  assert(sv != nullptr);
+  auto varName = sv->getName();
+  for (auto &boundVar : m_boundVars) {
+    if (varName == boundVar) return sv;
+  }
+  return newQueryParamRef(sv);
+}
+
+/**
+* Query expressions introduce a local scope with names introduced
+* by some of the clauses of the query expression. This needs
+* special handling so that we can track variables local to the query.
+*/
+QueryExpressionPtr CaptureExtractor::rewriteQuery(QueryExpressionPtr qe) {
+  assert(qe != nullptr);
+  auto clauses = qe->getClauses();
+  auto newClauses = rewriteExpressionList(clauses);
+  if (clauses == newClauses) return qe;
+  QueryExpressionPtr result(
+    new QueryExpression(qe->getScope(), qe->getLocation(), newClauses)
+  );
+  return result;
+}
+
+/**
+ * Rewrites any expression query clauses in this list of clauses, taking care
+ * to track variables local to the query.
+ */
+ExpressionListPtr CaptureExtractor::rewriteExpressionList(ExpressionListPtr l) {
+  int np = 0;
+  int nc = l->getCount();
+  ExpressionListPtr newList(
+    new ExpressionList(l->getScope(), l->getLocation())
+  );
+  bool noRewrites = true;
+  for (int i = 0; i < nc; i++) {
+    auto e = (*l)[i];
+    assert(e != nullptr);
+    auto kind = e->getKindOf();
+    switch (kind) {
+      case Expression::KindOfIntoClause: {
+        // The into expression is in the scope of the into clause
+        SimpleQueryClausePtr qcp(static_pointer_cast<SimpleQueryClause>(e));
+        m_boundVars.push_back(qcp->getIdentifier());
+        np++;
+        break;
+      }
+      case Expression::KindOfJoinClause: {
+        JoinClausePtr jcp(static_pointer_cast<JoinClause>(e));
+        m_boundVars.push_back(jcp->getVar());
+        np++;
+        break;
+      }
+      default:
+        break;
+    }
+    auto ne = rewrite(e);
+    if (ne != e) noRewrites = false;
+    newList->addElement(ne);
+    // deal with clauses that introduce names for subsequent clauses
+    switch (kind) {
+      case Expression::KindOfFromClause:
+      case Expression::KindOfLetClause: {
+        SimpleQueryClausePtr qcp(static_pointer_cast<SimpleQueryClause>(e));
+        m_boundVars.push_back(qcp->getIdentifier());
+        np++;
+        break;
+      }
+      case Expression::KindOfJoinClause: {
+        JoinClausePtr jcp(static_pointer_cast<JoinClause>(e));
+        auto groupId = jcp->getGroup();
+        if (!groupId.empty()) {
+          m_boundVars.push_back(groupId);
+          np++;
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  while (np-- > 0) m_boundVars.pop_back();
+  if (noRewrites) return l;
+  return newList;
+}
+
+/*
+ * If the expression of a simple query clause is query local, then
+ * return the clause as is. Otherwise return a clone of the clause
+ * with the expression rewritten to reference a query parameter.
+ */
+SimpleQueryClausePtr CaptureExtractor::rewriteSimpleClause(
+    SimpleQueryClausePtr sc) {
+  assert (sc != nullptr);
+  auto expr = sc->getExpression();
+  auto newExpr = rewrite(expr);
+  if (expr == newExpr) return sc;
+  auto rsc = static_pointer_cast<SimpleQueryClause>(sc->clone());
+  rsc->setExpression(newExpr);
+  return rsc;
+}
+
+/*
+ * If the object expression is query local, that is, if it is a simple variable
+ * referring to a name declared in a query clause, or itself a query local
+ * object expression, then if keep this expression as is. If not, then
+ * rewrite this expression into a query parameter reference.
+ */
+ExpressionPtr CaptureExtractor::rewriteObjectProperty(
+  ObjectPropertyExpressionPtr ope) {
+  assert(ope != nullptr);
+  auto obj = ope->getObject();
+  if (this->dependsOnQueryOnlyState(obj)) {
+    auto prop = ope->getProperty();
+    if (prop->getKindOf() == Expression::KindOfScalarExpression) {
+      auto scalar = static_pointer_cast<ScalarExpression>(prop);
+      const string &propName = scalar->getLiteralString();
+      if (!propName.empty()) {
+        return ope;
+      }
+    }
+  }
+  return newQueryParamRef(ope);
+}
+
+/**
+ * If the unary operation is not PHP specific, but something a query
+ * processor can handle (+ - ! ~), then rewrite the operand to something
+ * the query processor can evaluate (such as a query parameter reference)
+ * and rewrite the entire expression to use the rewritten operand.
+ * If the rewritten operand is the same as the original operand, just
+ * return the expression as is.
+ */
+ExpressionPtr CaptureExtractor::rewriteUnary(UnaryOpExpressionPtr ue) {
+  assert (ue != nullptr);
+  if (!ue->getFront()) return nullptr;
+  switch (ue->getOp()) {
+    case '+':
+    case '-':
+    case '!':
+    case '~':
+      break; // Could be something the query processor can handle
+    default:
+      return newQueryParamRef(ue);
+  }
+  auto expr = ue->getExpression();
+  auto newExpr = rewrite(expr);
+  if (expr == newExpr) return ue;
+  UnaryOpExpressionPtr result(
+    new UnaryOpExpression(ue->getScope(), ue->getLocation(),
+                          newExpr, ue->getOp(), true)
+  );
+  return result;
+}
+
+/**
+ * If the binary operation is not PHP specific, but something a query
+ * processor can handle (+ - * and so on), then rewrite the operands to
+ * something the query processor can evaluate (such as a query parameter
+ * references) and rewrite the entire expression to use the rewritten operands.
+ * If the rewritten operands are the same as the original operands, just
+ * return the expression as is.
+ */
+ExpressionPtr CaptureExtractor::rewriteBinary(BinaryOpExpressionPtr be) {
+  assert(be != nullptr);
+  switch (be->getOp()) {
+    case '+':
+    case '-':
+    case '*':
+    case '/':
+    case '%':
+    case '&':
+    case '|':
+    case '^':
+    case T_IS_IDENTICAL:
+    case T_IS_EQUAL:
+    case '>':
+    case '<':
+    case T_IS_GREATER_OR_EQUAL:
+    case T_IS_SMALLER_OR_EQUAL:
+    case T_IS_NOT_IDENTICAL:
+    case T_IS_NOT_EQUAL:
+    case T_BOOLEAN_OR:
+    case T_BOOLEAN_AND:
+    case T_LOGICAL_OR:
+    case T_LOGICAL_AND:
+    case '.':
+      break; // Could be something the query processor can handle
+
+    default:
+      return newQueryParamRef(be);
+  }
+  auto expr1 = be->getExp1();
+  auto expr2 = be->getExp2();
+  auto newExpr1 = rewrite(expr1);
+  auto newExpr2 = rewrite(expr2);
+  if (expr1 == newExpr1 && expr2 == newExpr2) return be;
+  BinaryOpExpressionPtr result(
+    new BinaryOpExpression(be->getScope(), be->getLocation(),
+                          newExpr1, newExpr2, be->getOp())
+  );
+  return result;
+}
+
+}

hphp/compiler/analysis/capture_extractor.h

@@ -0,0 +1,66 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef incl_HPHP_CAPTURE_EXTRACTOR_H_
+#define incl_HPHP_CAPTURE_EXTRACTOR_H_
+
+#include "hphp/compiler/expression/binary_op_expression.h"
+#include "hphp/compiler/expression/expression.h"
+#include "hphp/compiler/expression/object_property_expression.h"
+#include "hphp/compiler/expression/query_expression.h"
+#include "hphp/compiler/expression/simple_function_call.h"
+#include "hphp/compiler/expression/simple_query_clause.h"
+#include "hphp/compiler/expression/simple_variable.h"
+#include "hphp/compiler/expression/unary_op_expression.h"
+
+namespace HPHP {
+///////////////////////////////////////////////////////////////////////////////
+
+/** A rewriter for query expressions that capture variables that lie
+ *  outside of the scope of the query expression. Subexpressions that
+ *  contain such references are turned into references to query parameter
+ *  variables. The original expressions are collected into the list
+ *  returned by getCapturedEpressions. Their runtime values are obtained
+ *  before the query is evaluated and are passed as arguments to the query
+ *  processor.
+ */
+class CaptureExtractor {
+public:
+
+  ExpressionPtr rewrite(ExpressionPtr ep);
+
+  std::vector<ExpressionPtr> getCapturedExpressions() {
+    return m_capturedExpressions;
+  }
+
+private:
+  bool dependsOnQueryOnlyState(ExpressionPtr e);
+  SimpleVariablePtr newQueryParamRef(ExpressionPtr ae);
+  ExpressionPtr rewriteBinary(BinaryOpExpressionPtr be);
+  ExpressionPtr rewriteCall(SimpleFunctionCallPtr sfc);
+  ExpressionListPtr rewriteExpressionList(ExpressionListPtr l);
+  ExpressionPtr rewriteObjectProperty(ObjectPropertyExpressionPtr ope);
+  QueryExpressionPtr rewriteQuery(QueryExpressionPtr qe);
+  SimpleQueryClausePtr rewriteSimpleClause(SimpleQueryClausePtr sc);
+  SimpleVariablePtr rewriteSimpleVariable(SimpleVariablePtr sv);
+  ExpressionPtr rewriteUnary(UnaryOpExpressionPtr ue);
+
+  std::vector<ExpressionPtr> m_capturedExpressions;
+  std::vector<std::string> m_boundVars;
+};
+
+}
+#endif // incl_HPHP_CAPTURE_EXTRACTOR_H_

hphp/compiler/analysis/class_scope.cpp

@@ -34,14 +34,15 @@
 #include "hphp/compiler/statement/function_statement.h"
 #include "hphp/compiler/statement/method_statement.h"
 #include "hphp/compiler/statement/statement_list.h"
-#include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/base/class_info.h"
+#include "hphp/runtime/base/builtin-functions.h"
+#include "hphp/runtime/base/class-info.h"
 #include "hphp/compiler/statement/class_variable.h"
 #include "hphp/compiler/statement/class_constant.h"
 #include "hphp/compiler/statement/use_trait_statement.h"
+#include "hphp/compiler/statement/trait_require_statement.h"
 #include "hphp/compiler/statement/trait_prec_statement.h"
 #include "hphp/compiler/statement/trait_alias_statement.h"
-#include "hphp/runtime/base/zend/zend_string.h"
+#include "hphp/runtime/base/zend-string.h"
 #include "hphp/util/util.h"
 
 #include <boost/foreach.hpp>
@@ -62,7 +63,7 @@ ClassScope::ClassScope(KindOf kindOf, const std::string &name,
     m_kindOf(kindOf), m_derivesFromRedeclaring(FromNormal),
     m_traitStatus(NOT_FLATTENED), m_volatile(false),
     m_persistent(false), m_derivedByDynamic(false),
-    m_sep(false), m_needsCppCtor(false), m_needsInit(true), m_knownBases(0) {
+    m_needsCppCtor(false), m_needsInit(true), m_knownBases(0) {
 
   m_dynamic = Option::IsDynamicClass(m_name);
 
@@ -92,7 +93,7 @@ ClassScope::ClassScope(AnalysisResultPtr ar,
     m_kindOf(KindOfObjectClass), m_derivesFromRedeclaring(FromNormal),
     m_traitStatus(NOT_FLATTENED), m_dynamic(false),
     m_volatile(false), m_persistent(false),
-    m_derivedByDynamic(false), m_sep(false), m_needsCppCtor(false),
+    m_derivedByDynamic(false), m_needsCppCtor(false),
     m_needsInit(true), m_knownBases(0) {
   BOOST_FOREACH(FunctionScopePtr f, methods) {
     if (f->getName() == "__construct") setAttribute(HasConstructor);
@@ -403,23 +404,12 @@ MethodStatementPtr
 ClassScope::importTraitMethod(const TraitMethod&  traitMethod,
                               AnalysisResultPtr   ar,
                               string              methName,
-                              GeneratorRenameMap& genRenameMap,
                               const std::map<string, MethodStatementPtr>&
                               importedTraitMethods) {
   MethodStatementPtr meth = traitMethod.m_method;
   string origMethName = traitMethod.m_originalName;
   ModifierExpressionPtr modifiers = traitMethod.m_modifiers;
 
-  if (meth->getOrigGeneratorFunc()) {
-    const string &name = meth->getOrigGeneratorFunc()->getName();
-    if (!importedTraitMethods.count(name)) {
-      // Dont import the generator, if the origGenerator wasnt imported
-      // this happens when a generator in the trait is hidden by a non-generator
-      // method in the importing class.
-      return MethodStatementPtr();
-    }
-  }
-
   MethodStatementPtr cloneMeth = dynamic_pointer_cast<MethodStatement>(
     dynamic_pointer_cast<ClassStatement>(m_stmt)->addClone(meth));
   cloneMeth->setName(methName);
@@ -434,17 +424,9 @@ ClassScope::importTraitMethod(const TraitMethod&  traitMethod,
   ClassScopePtr cScope = dynamic_pointer_cast<ClassScope>(shared_from_this());
   cloneMeth->fixupSelfAndParentTypehints( cScope );
 
-  // Generator methods need to be renamed, otherwise code gen produces multiple
-  // continuation classes with the same name
-  if (funcScope->isGenerator()) {
-    const string& newName = getNewGeneratorName(funcScope, genRenameMap);
-    methName = origMethName = newName;
-    cloneMeth->setName(newName);
-    cloneMeth->setOriginalName(newName);
-  }
   FunctionScopePtr cloneFuncScope
     (new HPHP::FunctionScope(funcScope, ar, methName, origMethName, cloneMeth,
-                             cloneMeth->getModifiers()));
+                             cloneMeth->getModifiers(), cScope->isUserClass()));
   cloneMeth->resetScope(cloneFuncScope, true);
   cloneFuncScope->setOuterScope(shared_from_this());
   informClosuresAboutScopeClone(cloneMeth, cloneFuncScope, ar);
@@ -492,6 +474,17 @@ void ClassScope::addImportTraitMethod(const TraitMethod &traitMethod,
   m_importMethToTraitMap[methName].push_back(traitMethod);
 }
 
+void ClassScope::addTraitRequirement(const string &requiredName,
+                                     bool isExtends) {
+  assert(isTrait());
+
+  if (isExtends) {
+    m_traitRequiredExtends.insert(requiredName);
+  } else {
+    m_traitRequiredImplements.insert(requiredName);
+  }
+}
+
 void
 ClassScope::setImportTraitMethodModifiers(const string &methName,
                                           ClassScopePtr traitCls,
@@ -552,6 +545,7 @@ ClassScope::findTraitMethod(AnalysisResultPtr ar,
 
 void ClassScope::findTraitMethodsToImport(AnalysisResultPtr ar,
                                           ClassScopePtr trait) {
+  assert(Option::WholeProgram);
   ClassStatementPtr tStmt =
     dynamic_pointer_cast<ClassStatement>(trait->getStmt());
   StatementListPtr tStmts = tStmt->getStmts();
@@ -568,7 +562,45 @@ void ClassScope::findTraitMethodsToImport(AnalysisResultPtr ar,
   }
 }
 
+void ClassScope::importTraitRequirements(AnalysisResultPtr ar,
+                                         ClassScopePtr trait) {
+  if (isTrait()) {
+    for (auto const& req : trait->getTraitRequiredExtends()) {
+      addTraitRequirement(req, true);
+    }
+    for (auto const& req : trait->getTraitRequiredImplements()) {
+      addTraitRequirement(req, false);
+    }
+  } else {
+    for (auto const& req : trait->getTraitRequiredExtends()) {
+      if (!derivesFrom(ar, req, true, false)) {
+        getStmt()->analysisTimeFatal(
+          Compiler::InvalidDerivation,
+          Strings::TRAIT_REQ_EXTENDS,
+          m_originalName.c_str(),
+          req.c_str(),
+          trait->getOriginalName().c_str(),
+          "use"
+        );
+      }
+    }
+    for (auto const& req : trait->getTraitRequiredImplements()) {
+      if (!derivesFrom(ar, req, true, false)) {
+        getStmt()->analysisTimeFatal(
+          Compiler::InvalidDerivation,
+          Strings::TRAIT_REQ_IMPLEMENTS,
+          m_originalName.c_str(),
+          req.c_str(),
+          trait->getOriginalName().c_str(),
+          "use"
+        );
+      }
+    }
+  }
+}
+
 void ClassScope::applyTraitPrecRule(TraitPrecStatementPtr stmt) {
+  assert(Option::WholeProgram);
   const string methodName = Util::toLower(stmt->getMethodName());
   const string selectedTraitName = Util::toLower(stmt->getTraitName());
   std::set<string> otherTraitNames;
@@ -599,12 +631,20 @@ void ClassScope::applyTraitPrecRule(TraitPrecStatementPtr stmt) {
 
   // Report error if didn't find the selected trait
   if (!foundSelectedTrait) {
-    Compiler::Error(Compiler::UnknownTrait, stmt);
+    stmt->analysisTimeFatal(
+      Compiler::UnknownTrait,
+      Strings::TRAITS_UNKNOWN_TRAIT,
+      selectedTraitName.c_str()
+    );
   }
 
   // Sanity checking: otherTraitNames should be empty now
   if (otherTraitNames.size()) {
-    Compiler::Error(Compiler::UnknownTrait, stmt);
+    stmt->analysisTimeFatal(
+      Compiler::UnknownTrait,
+      Strings::TRAITS_UNKNOWN_TRAIT,
+      selectedTraitName.c_str()
+    );
   }
 }
 
@@ -615,6 +655,7 @@ bool ClassScope::hasMethod(const string &methodName) const {
 ClassScopePtr
 ClassScope::findSingleTraitWithMethod(AnalysisResultPtr ar,
                                       const string &methodName) const {
+  assert(Option::WholeProgram);
   ClassScopePtr trait = ClassScopePtr();
 
   for (unsigned i = 0; i < m_usedTraitNames.size(); i++) {
@@ -632,6 +673,7 @@ ClassScope::findSingleTraitWithMethod(AnalysisResultPtr ar,
 }
 
 void ClassScope::addTraitAlias(TraitAliasStatementPtr aliasStmt) {
+  assert(Option::WholeProgram);
   const string &traitName = aliasStmt->getTraitName();
   const string &origMethName = aliasStmt->getMethodName();
   const string &newMethName = aliasStmt->getNewMethodName();
@@ -642,6 +684,7 @@ void ClassScope::addTraitAlias(TraitAliasStatementPtr aliasStmt) {
 
 void ClassScope::applyTraitAliasRule(AnalysisResultPtr ar,
                                      TraitAliasStatementPtr stmt) {
+  assert(Option::WholeProgram);
   const string traitName = Util::toLower(stmt->getTraitName());
   const string origMethName = Util::toLower(stmt->getMethodName());
   const string newMethName = Util::toLower(stmt->getNewMethodName());
@@ -654,8 +697,11 @@ void ClassScope::applyTraitAliasRule(AnalysisResultPtr ar,
     traitCls = ar->findClass(traitName);
   }
   if (!traitCls || !(traitCls->isTrait())) {
-    Compiler::Error(Compiler::UnknownTrait, stmt);
-    return;
+    stmt->analysisTimeFatal(
+      Compiler::UnknownTrait,
+      Strings::TRAITS_UNKNOWN_TRAIT,
+      traitName.empty() ? origMethName.c_str() : traitName.c_str()
+    );
   }
 
   // Keep record of alias rule
@@ -666,8 +712,10 @@ void ClassScope::applyTraitAliasRule(AnalysisResultPtr ar,
   MethodStatementPtr methStmt = findTraitMethod(ar, traitCls, origMethName,
                                                 visitedTraits);
   if (!methStmt) {
-    Compiler::Error(Compiler::UnknownTraitMethod, stmt);
-    return;
+    stmt->analysisTimeFatal(
+      Compiler::UnknownTraitMethod,
+      Strings::TRAITS_UNKNOWN_TRAIT_METHOD, origMethName.c_str()
+    );
   }
 
   if (origMethName == newMethName) {
@@ -682,6 +730,7 @@ void ClassScope::applyTraitAliasRule(AnalysisResultPtr ar,
 }
 
 void ClassScope::applyTraitRules(AnalysisResultPtr ar) {
+  assert(Option::WholeProgram);
   ClassStatementPtr classStmt = dynamic_pointer_cast<ClassStatement>(getStmt());
   assert(classStmt);
   StatementListPtr stmts = classStmt->getStmts();
@@ -714,6 +763,7 @@ void ClassScope::applyTraitRules(AnalysisResultPtr ar) {
 //   1) implemented by other traits
 //   2) duplicate
 void ClassScope::removeSpareTraitAbstractMethods(AnalysisResultPtr ar) {
+  assert(Option::WholeProgram);
   for (MethodToTraitListMap::iterator iter = m_importMethToTraitMap.begin();
        iter != m_importMethToTraitMap.end(); iter++) {
 
@@ -750,89 +800,18 @@ void ClassScope::removeSpareTraitAbstractMethods(AnalysisResultPtr ar) {
   }
 }
 
-const string& ClassScope::getNewGeneratorName(
-  FunctionScopePtr genFuncScope, GeneratorRenameMap &genRenameMap) {
-  assert(genFuncScope->isGenerator());
-  const string& oldName = genFuncScope->getName();
-  GeneratorRenameMap::iterator mapIt = genRenameMap.find(oldName);
-  if (mapIt != genRenameMap.end()) {
-    return mapIt->second;
-  }
-  string newName = ParserBase::newContinuationName(
-    oldName + "_" + lexical_cast<string>(genFuncScope->getNewID())
-  );
-  genRenameMap[oldName] = newName;
-  return genRenameMap[oldName];
-}
-
-void
-ClassScope::renameCreateContinuationCalls(AnalysisResultPtr ar,
-                                          ConstructPtr      c,
-                                          ImportedMethodMap &importedMethods) {
-  if (!c) return;
-  SimpleFunctionCallPtr funcCall = dynamic_pointer_cast<SimpleFunctionCall>(c);
-  if (funcCall && funcCall->getName() == "hphp_create_continuation") {
-
-    ExpressionListPtr params = funcCall->getParams();
-    assert(params->getCount() >= 2);
-    const string &oldClassName =
-      dynamic_pointer_cast<ScalarExpression>((*params)[0])->getString();
-    ClassScopePtr oldClassScope = ar->findClass(oldClassName);
-    if (!oldClassScope || !oldClassScope->isTrait()) return;
-
-    const string &oldGenName =
-      dynamic_pointer_cast<ScalarExpression>((*params)[1])->getString();
-
-    MethodStatementPtr origGenStmt = importedMethods[Util::toLower(oldGenName)];
-    assert(origGenStmt);
-
-    const string &newGenName = origGenStmt->getOriginalName();
-    ExpressionPtr newGenExpr = funcCall->makeScalarExpression(ar, newGenName);
-    ExpressionPtr newClsExpr = funcCall->makeScalarExpression(ar, getName());
-    (*params)[0] = newClsExpr;
-    (*params)[1] = newGenExpr;
-    funcCall->analyzeProgram(ar);
-    return;
-  }
-  for (int i=0; i < c->getKidCount(); i++) {
-    renameCreateContinuationCalls(ar, c->getNthKid(i), importedMethods);
-  }
-}
-
-void ClassScope::relinkGeneratorMethods(
-  AnalysisResultPtr ar,
-  ImportedMethodMap &importedMethods) {
-  for (ImportedMethodMap::const_iterator methIt =
-         importedMethods.begin(); methIt != importedMethods.end(); methIt++) {
-    MethodStatementPtr newMeth = methIt->second;
-
-    // Skip non-generator methods
-    if (!newMeth) continue;
-
-    if (newMeth->getOrigGeneratorFunc()) {
-      // Get corresponding original generator method in the current class
-      const string& origGenName = newMeth->getOrigGeneratorFunc()->getName();
-      MethodStatementPtr origGenStmt = importedMethods[origGenName];
-      assert(origGenStmt);
-      // It must be an orig gen func already, we're just updating to point
-      // to the corresponding method cloned from the trait
-      assert(origGenStmt->getGeneratorFunc());
-      newMeth->setOrigGeneratorFunc(origGenStmt);
-      origGenStmt->setGeneratorFunc(newMeth);
-    }
-
-    // OrigGenerator methods need to have their hphp_create_continuation calls
-    // patched to the new generator name.
-    if (newMeth->getGeneratorFunc()) {
-      renameCreateContinuationCalls(ar, newMeth, importedMethods);
-    }
-  }
-}
-
 void ClassScope::importUsedTraits(AnalysisResultPtr ar) {
+  // Trait flattening is supposed to happen only when we have awareness of
+  // the whole program.
+  assert(Option::WholeProgram);
+
   if (m_traitStatus == FLATTENED) return;
   if (m_traitStatus == BEING_FLATTENED) {
-    Compiler::Error(Compiler::CyclicDependentTraits, getStmt());
+    getStmt()->analysisTimeFatal(
+      Compiler::CyclicDependentTraits,
+      "Cyclic dependency between traits involving %s",
+      getOriginalName().c_str()
+    );
     return;
   }
   if (m_usedTraitNames.size() == 0) {
@@ -849,18 +828,53 @@ void ClassScope::importUsedTraits(AnalysisResultPtr ar) {
     }
   }
 
+  if (isTrait()) {
+    for (auto const& req : getTraitRequiredExtends()) {
+      ClassScopePtr rCls = ar->findClass(req);
+      if (!rCls || rCls->isFinal() || rCls->isInterface()) {
+        getStmt()->analysisTimeFatal(
+          Compiler::InvalidDerivation,
+          Strings::TRAIT_BAD_REQ_EXTENDS,
+          m_originalName.c_str(),
+          req.c_str(),
+          req.c_str()
+        );
+      }
+    }
+    for (auto const& req : getTraitRequiredImplements()) {
+      ClassScopePtr rCls = ar->findClass(req);
+      if (!rCls || !(rCls->isInterface())) {
+        getStmt()->analysisTimeFatal(
+          Compiler::InvalidDerivation,
+          Strings::TRAIT_BAD_REQ_IMPLEMENTS,
+          m_originalName.c_str(),
+          req.c_str(),
+          req.c_str()
+        );
+      }
+    }
+  }
+
   // Find trait methods to be imported
   for (unsigned i = 0; i < m_usedTraitNames.size(); i++) {
     ClassScopePtr tCls = ar->findClass(m_usedTraitNames[i]);
     if (!tCls || !(tCls->isTrait())) {
-      setAttribute(UsesUnknownTrait);
-      Compiler::Error(Compiler::UnknownTrait, getStmt());
-      continue;
+      setAttribute(UsesUnknownTrait); // XXX: is this useful ... for anything?
+      getStmt()->analysisTimeFatal(
+        Compiler::UnknownTrait,
+        Strings::TRAITS_UNKNOWN_TRAIT,
+        m_usedTraitNames[i].c_str()
+      );
     }
     // First, make sure the used trait is flattened
     tCls->importUsedTraits(ar);
 
     findTraitMethodsToImport(ar, tCls);
+
+    // Import any interfaces implemented
+    tCls->getInterfaces(ar, m_bases, false);
+
+    importTraitRequirements(ar, tCls);
   }
 
   // Apply rules
@@ -880,9 +894,7 @@ void ClassScope::importUsedTraits(AnalysisResultPtr ar) {
   }
 
   std::map<string, MethodStatementPtr> importedTraitMethods;
-  std::vector<std::pair<string,const TraitMethod*> > importedTraitsWithOrigName;
-
-  GeneratorRenameMap genRenameMap;
+  std::vector<std::pair<string,const TraitMethod*>> importedTraitsWithOrigName;
 
   // Actually import the methods
   for (MethodToTraitListMap::const_iterator
@@ -896,7 +908,11 @@ void ClassScope::importUsedTraits(AnalysisResultPtr ar) {
     }
     // Consistency checking: each name must only refer to one imported method
     if (iter->second.size() > 1) {
-      Compiler::Error(Compiler::MethodInMultipleTraits, getStmt());
+      getStmt()->analysisTimeFatal(
+        Compiler::MethodInMultipleTraits,
+        Strings::METHOD_IN_MULTIPLE_TRAITS,
+        iter->first.c_str()
+      );
     } else {
       TraitMethodList::const_iterator traitMethIter = iter->second.begin();
       if ((traitMethIter->m_modifiers ? traitMethIter->m_modifiers :
@@ -907,13 +923,6 @@ void ClassScope::importUsedTraits(AnalysisResultPtr ar) {
           continue;
         }
       }
-      if (traitMethIter->m_modifiers &&
-          traitMethIter->m_modifiers->isStatic()) {
-        Compiler::Error(Compiler::InvalidAccessModifier,
-                        traitMethIter->m_modifiers);
-        continue;
-      }
-
       string sourceName = traitMethIter->m_ruleStmt ?
         Util::toLower(((TraitAliasStatement*)traitMethIter->m_ruleStmt.get())->
                       getMethodName()) : iter->first;
@@ -928,15 +937,12 @@ void ClassScope::importUsedTraits(AnalysisResultPtr ar) {
     const TraitMethod *traitMethod = importedTraitsWithOrigName[i].second;
     MethodStatementPtr newMeth = importTraitMethod(
       *traitMethod, ar, Util::toLower(traitMethod->m_originalName),
-      genRenameMap, importedTraitMethods);
+      importedTraitMethods);
     if (newMeth) {
       importedTraitMethods[sourceName] = newMeth;
     }
   }
 
-  // Relink generator and origGenerator methods
-  relinkGeneratorMethods(ar, importedTraitMethods);
-
   // Import trait properties
   importTraitProperties(ar);
 
@@ -1198,10 +1204,10 @@ void ClassScope::getAllParents(AnalysisResultConstPtr ar,
                                std::vector<std::string> &names) {
   if (m_stmt) {
     if (isInterface()) {
-      boost::dynamic_pointer_cast<InterfaceStatement>
+      dynamic_pointer_cast<InterfaceStatement>
         (m_stmt)->getAllParents(ar, names);
     } else {
-      boost::dynamic_pointer_cast<ClassStatement>
+      dynamic_pointer_cast<ClassStatement>
         (m_stmt)->getAllParents(ar, names);
     }
   } else {
@@ -1237,8 +1243,7 @@ void ClassScope::getInterfaces(AnalysisResultConstPtr ar,
       if (cls && cls->isRedeclaring()) {
         cls = self->findExactClass(cls);
       }
-      if (cls) names.push_back(cls->getDocName());
-      else     names.push_back(*it);
+      names.push_back(cls ? cls->getDocName() : *it);
       if (cls && recursive) {
         cls->getInterfaces(ar, names, true);
       }

hphp/compiler/analysis/class_scope.h

@@ -24,8 +24,9 @@
 #include "hphp/compiler/statement/trait_prec_statement.h"
 #include "hphp/compiler/statement/trait_alias_statement.h"
 #include "hphp/compiler/expression/user_attribute.h"
-#include "hphp/util/json.h"
-#include "hphp/util/case_insensitive.h"
+#include "hphp/compiler/json.h"
+#include "hphp/util/functional.h"
+#include "hphp/util/hash-map-typedefs.h"
 #include "hphp/compiler/option.h"
 
 namespace HPHP {
@@ -169,14 +170,11 @@ public:
     return m_derivedByDynamic;
   }
 
-  /* Whether this class is brought in by a separable extension */
-  void setSepExtension() { m_sep = true;}
-  bool isSepExtension() const { return m_sep;}
-
   /**
    * Get/set attributes.
    */
   void setSystem();
+  bool isSystem() const { return m_attribute & System; }
   void setAttribute(Attribute attr) { m_attribute |= attr;}
   void clearAttribute(Attribute attr) { m_attribute &= ~attr;}
   bool getAttribute(Attribute attr) const {
@@ -305,17 +303,29 @@ public:
     }
   }
 
+  const boost::container::flat_set<std::string>& getTraitRequiredExtends()
+    const {
+    return m_traitRequiredExtends;
+  }
+
+  const boost::container::flat_set<std::string>& getTraitRequiredImplements()
+    const {
+    return m_traitRequiredImplements;
+  }
+
   const std::vector<std::string> &getUsedTraitNames() const {
     return m_usedTraitNames;
   }
 
-  const std::vector<std::pair<std::string, std::string> > &getTraitAliases()
+  const std::vector<std::pair<std::string, std::string>>& getTraitAliases()
     const {
     return m_traitAliases;
   }
 
   void addTraitAlias(TraitAliasStatementPtr aliasStmt);
 
+  void addTraitRequirement(const std::string &requiredName, bool isExtends);
+
   void importUsedTraits(AnalysisResultPtr ar);
 
   /**
@@ -373,6 +383,16 @@ public:
   bool canSkipCreateMethod(AnalysisResultConstPtr ar) const;
   bool checkHasPropTable(AnalysisResultConstPtr ar);
 
+  const StringData* getFatalMessage() const {
+    return m_fatal_error_msg;
+  }
+
+  void setFatal(const AnalysisTimeFatalException& fatal) {
+    assert(m_fatal_error_msg == nullptr);
+    m_fatal_error_msg = makeStaticString(fatal.getMessage());
+    assert(m_fatal_error_msg != nullptr);
+  }
+
 private:
   // need to maintain declaration order for ClassInfo map
   FunctionScopePtrVec m_functionsVec;
@@ -382,6 +402,8 @@ private:
   UserAttributeMap m_userAttributes;
 
   std::vector<std::string> m_usedTraitNames;
+  boost::container::flat_set<std::string> m_traitRequiredExtends;
+  boost::container::flat_set<std::string> m_traitRequiredImplements;
   // m_traitAliases is used to support ReflectionClass::getTraitAliases
   std::vector<std::pair<std::string, std::string> > m_traitAliases;
 
@@ -407,7 +429,6 @@ private:
 
   typedef std::list<TraitMethod> TraitMethodList;
   typedef std::map<std::string, TraitMethodList> MethodToTraitListMap;
-  typedef std::map<std::string, std::string> GeneratorRenameMap;
   MethodToTraitListMap m_importMethToTraitMap;
   typedef std::map<std::string, MethodStatementPtr> ImportedMethodMap;
 
@@ -424,7 +445,6 @@ private:
   unsigned m_volatile:1; // for class_exists
   unsigned m_persistent:1;
   unsigned m_derivedByDynamic:1;
-  unsigned m_sep:1;
   unsigned m_needsCppCtor:1;
   unsigned m_needsInit:1;
   // m_knownBases has a bit for each base class saying whether
@@ -433,6 +453,9 @@ private:
   // bases 32 through n are all known.
   unsigned m_knownBases;
 
+  // holds the fact that accessing this class declaration is a fatal error
+  const StringData* m_fatal_error_msg = nullptr;
+
   void addImportTraitMethod(const TraitMethod &traitMethod,
                             const std::string &methName);
   void informClosuresAboutScopeClone(ConstructPtr root,
@@ -446,17 +469,15 @@ private:
   MethodStatementPtr importTraitMethod(const TraitMethod&  traitMethod,
                                        AnalysisResultPtr   ar,
                                        std::string         methName,
-                                       GeneratorRenameMap& genRenameMap,
                                        const ImportedMethodMap &
                                        importedTraitMethods);
 
   void importTraitProperties(AnalysisResultPtr ar);
 
-  void relinkGeneratorMethods(AnalysisResultPtr ar,
-                              ImportedMethodMap& importedMethods);
-
   void findTraitMethodsToImport(AnalysisResultPtr ar, ClassScopePtr trait);
 
+  void importTraitRequirements(AnalysisResultPtr ar, ClassScopePtr trait);
+
   MethodStatementPtr findTraitMethod(AnalysisResultPtr ar,
                                      ClassScopePtr trait,
                                      const std::string &methodName,
@@ -477,12 +498,6 @@ private:
 
   bool hasMethod(const std::string &methodName) const;
 
-  const std::string& getNewGeneratorName(FunctionScopePtr    genFuncScope,
-                                         GeneratorRenameMap& genRenameMap);
-
-  void renameCreateContinuationCalls(AnalysisResultPtr ar, ConstructPtr c,
-                                     ImportedMethodMap &importedMethods);
-
 };
 
 ///////////////////////////////////////////////////////////////////////////////

hphp/compiler/analysis/code_error.h

@@ -18,7 +18,7 @@
 #define incl_HPHP_COMPILER_ERROR_H_
 
 #include "hphp/compiler/analysis/type.h"
-#include "hphp/util/json.h"
+#include "hphp/compiler/json.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////

hphp/compiler/analysis/constant_table.cpp

@@ -25,7 +25,7 @@
 #include "hphp/util/util.h"
 #include "hphp/util/hash.h"
 #include "hphp/compiler/analysis/class_scope.h"
-#include "hphp/runtime/base/complex_types.h"
+#include "hphp/runtime/base/complex-types.h"
 
 using namespace HPHP;
 

hphp/compiler/analysis/control_flow.cpp

@@ -64,8 +64,8 @@ typedef hphp_hash_map<ConstructRawPtr, ControlBlock*,
 
 class ControlFlowBuilder : public FunctionWalker {
 public:
-  ControlFlowBuilder(ControlFlowGraph *g, bool isGenerator) :
-      m_graph(g), m_pass(0), m_isGenerator(isGenerator), m_cur(0), m_head(0) {}
+  explicit ControlFlowBuilder(ControlFlowGraph *g) :
+      m_graph(g), m_pass(0), m_cur(0), m_head(0) {}
 
   int before(ConstructRawPtr cp);
   int after(ConstructRawPtr cp);
@@ -161,7 +161,6 @@ private:
   ControlFlowGraph               *m_graph;
   AstWalkerStateVec              m_state;
   int                            m_pass;
-  bool                           m_isGenerator;
   ControlBlock                   *m_cur;
   ControlBlock                   *m_head;
 
@@ -246,6 +245,7 @@ int ControlFlowBuilder::before(ConstructRawPtr cp) {
         Statement::KindOf stype = s->getKindOf();
         switch (stype) {
           case Statement::KindOfUseTraitStatement:
+          case Statement::KindOfTraitRequireStatement:
           case Statement::KindOfTraitPrecStatement:
           case Statement::KindOfTraitAliasStatement:
             not_reached();
@@ -417,7 +417,7 @@ int ControlFlowBuilder::before(ConstructRawPtr cp) {
 
           case Statement::KindOfReturnStatement: {
             setEdge(s, AfterConstruct, root(), AfterConstruct);
-            if (!m_isGenerator) noFallThrough(s);
+            noFallThrough(s);
             /*
              * Since almost anything in php /might/ throw, we
              * approximate, and add edges from the beginning and
@@ -868,7 +868,7 @@ ControlFlowGraph *ControlFlowGraph::buildControlFlow(MethodStatementPtr m) {
   ControlFlowGraph *graph = new ControlFlowGraph;
 
   graph->m_stmt = m;
-  ControlFlowBuilder cfb(graph, !!m->getOrigGeneratorFunc());
+  ControlFlowBuilder cfb(graph);
   cfb.run(m->getStmts());
   graph->m_nextDfn = 1;
   depth_first_visit(*graph, cfb.head(),

hphp/compiler/analysis/core_code_error.inc

@@ -37,10 +37,11 @@ CODE_ERROR_ENTRY(InvalidAttribute)
 CODE_ERROR_ENTRY(UnknownTrait)
 CODE_ERROR_ENTRY(MethodInMultipleTraits)
 CODE_ERROR_ENTRY(UnknownTraitMethod)
-CODE_ERROR_ENTRY(InvalidAccessModifier)
 CODE_ERROR_ENTRY(CyclicDependentTraits)
 CODE_ERROR_ENTRY(InvalidTraitStatement)
 CODE_ERROR_ENTRY(RedeclaredTrait)
 CODE_ERROR_ENTRY(InvalidInstantiation)
 CODE_ERROR_ENTRY(InvalidYield)
+CODE_ERROR_ENTRY(InvalidAwait)
 CODE_ERROR_ENTRY(BadDefaultValueType)
+CODE_ERROR_ENTRY(InvalidMethodDefinition)

hphp/compiler/analysis/data_flow.cpp

@@ -221,16 +221,16 @@ void DataFlow::ComputePartialDying(const ControlFlowGraph &g) {
 // DataFlowWalker
 
 int DataFlowWalker::after(ConstructRawPtr cp) {
-  if (ExpressionRawPtr e = boost::dynamic_pointer_cast<Expression>(cp)) {
+  if (ExpressionRawPtr e = dynamic_pointer_cast<Expression>(cp)) {
     switch (e->getKindOf()) {
       case Expression::KindOfSimpleVariable:
-        if (!boost::static_pointer_cast<SimpleVariable>(
+        if (!static_pointer_cast<SimpleVariable>(
               e)->getAlwaysStash()) {
           return WalkContinue;
         }
         break;
       case Expression::KindOfBinaryOpExpression:
-        if (boost::static_pointer_cast<BinaryOpExpression>(
+        if (static_pointer_cast<BinaryOpExpression>(
               e)->isShortCircuitOperator()) {
           break;
         }
@@ -246,7 +246,7 @@ int DataFlowWalker::after(ConstructRawPtr cp) {
         for (int i = 0, nk = e->getKidCount(); i < nk; i++) {
           ExpressionPtr k = e->getNthExpr(i);
           if (k && k->is(Expression::KindOfSimpleVariable) &&
-              !boost::static_pointer_cast<SimpleVariable>(
+              !static_pointer_cast<SimpleVariable>(
                 k)->getAlwaysStash()) {
             process(k);
           }
@@ -260,13 +260,13 @@ int DataFlowWalker::after(ConstructRawPtr cp) {
 }
 
 int DataFlowWalker::afterEach(ConstructRawPtr cur, int i, ConstructRawPtr kid) {
-  if (ExpressionRawPtr k = boost::dynamic_pointer_cast<Expression>(kid)) {
+  if (ExpressionRawPtr k = dynamic_pointer_cast<Expression>(kid)) {
     if (k->is(Expression::KindOfSimpleVariable) &&
-        !boost::static_pointer_cast<SimpleVariable>(k)->getAlwaysStash()) {
-      if (ExpressionRawPtr e = boost::dynamic_pointer_cast<Expression>(cur)) {
+        !static_pointer_cast<SimpleVariable>(k)->getAlwaysStash()) {
+      if (ExpressionRawPtr e = dynamic_pointer_cast<Expression>(cur)) {
         switch (e->getKindOf()) {
           case Expression::KindOfBinaryOpExpression:
-            if (!boost::static_pointer_cast<BinaryOpExpression>(
+            if (!static_pointer_cast<BinaryOpExpression>(
                   e)->isShortCircuitOperator()) {
               return WalkContinue;
             }

hphp/compiler/analysis/depth_first_visitor.h

@@ -64,12 +64,12 @@ public:
   }
 
   StatementPtr visitStmtRecur(StatementPtr stmt) {
-    BlockScopeRawPtr scope = boost::dynamic_pointer_cast<LoopStatement>(stmt) ?
+    BlockScopeRawPtr scope = dynamic_pointer_cast<LoopStatement>(stmt) ?
       stmt->getScope() : BlockScopeRawPtr();
 
     for (int i = 0, n = stmt->getKidCount(); i < n; i++) {
       if (ConstructPtr kid = stmt->getNthKid(i)) {
-        if (StatementPtr s = boost::dynamic_pointer_cast<Statement>(kid)) {
+        if (StatementPtr s = dynamic_pointer_cast<Statement>(kid)) {
           if (FunctionWalker::SkipRecurse(s)) continue;
           if (scope) scope->incLoopNestedLevel();
           if (StatementPtr rep = visitStmtRecur(s)) {
@@ -78,7 +78,7 @@ public:
           }
           if (scope) scope->decLoopNestedLevel();
         } else {
-          ExpressionPtr e = boost::dynamic_pointer_cast<Expression>(kid);
+          ExpressionPtr e = dynamic_pointer_cast<Expression>(kid);
           if (ExpressionPtr rep = visitExprRecur(e)) {
             stmt->setNthKid(i, rep);
             stmt->getScope()->addUpdates(BlockScope::UseKindCaller);

hphp/compiler/analysis/dictionary.cpp

@@ -39,11 +39,11 @@ void Dictionary::build(MethodStatementPtr m) {
 void Dictionary::build(StatementPtr stmt) {
   for (int i = 0, n = stmt->getKidCount(); i < n; i++) {
     if (ConstructPtr kid = stmt->getNthKid(i)) {
-      if (StatementPtr s = boost::dynamic_pointer_cast<Statement>(kid)) {
+      if (StatementPtr s = dynamic_pointer_cast<Statement>(kid)) {
         if (FunctionWalker::SkipRecurse(s)) continue;
         build(s);
       } else {
-        ExpressionPtr e = boost::dynamic_pointer_cast<Expression>(kid);
+        ExpressionPtr e = dynamic_pointer_cast<Expression>(kid);
         build(e);
       }
     }

hphp/compiler/analysis/emitter.h

@@ -20,6 +20,7 @@
 #include "hphp/compiler/expression/expression.h"
 #include "hphp/compiler/statement/statement.h"
 #include "hphp/compiler/statement/use_trait_statement.h"
+#include "hphp/compiler/statement/trait_require_statement.h"
 #include "hphp/compiler/statement/trait_prec_statement.h"
 #include "hphp/compiler/statement/trait_alias_statement.h"
 #include "hphp/compiler/statement/typedef_statement.h"
@@ -28,6 +29,9 @@
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/util/hash.h"
 
+#include <deque>
+#include <utility>
+
 namespace HPHP {
 
 DECLARE_BOOST_TYPES(ClosureExpression);
@@ -95,6 +99,7 @@ public:
     IterKind kind;
     Id id;
   };
+
 #define O(name, imm, pop, push, flags) \
   void name(imm);
 #define NA
@@ -106,19 +111,20 @@ public:
   typ1 a1, typ2 a2, typ3 a3
 #define FOUR(typ1, typ2, typ3, typ4) \
   typ1 a1, typ2 a2, typ3 a3, typ4 a4
-#define MA std::vector<uchar>
+#define MA std::vector<unsigned char>
 #define BLA std::vector<Label*>&
 #define SLA std::vector<StrOff>&
 #define ILA std::vector<IterPair>&
 #define IVA int32_t
-#define HA int32_t
+#define LA int32_t
 #define IA int32_t
 #define I64A int64_t
 #define DA double
 #define SA const StringData*
 #define AA ArrayData*
 #define BA Label&
-#define OA unsigned char
+#define OA(type) type
+#define VSA std::vector<std::string>&
   OPCODES
 #undef O
 #undef NA
@@ -131,7 +137,7 @@ public:
 #undef SLA
 #undef ILA
 #undef IVA
-#undef HA
+#undef LA
 #undef IA
 #undef I64A
 #undef DA
@@ -139,6 +145,7 @@ public:
 #undef AA
 #undef BA
 #undef OA
+#undef VSA
 private:
   ConstructPtr m_node;
   UnitEmitter& m_ue;
@@ -316,14 +323,137 @@ public:
 
 class Funclet {
 public:
-  Funclet(Thunklet* body, Label* entry) : m_body(body), m_entry(entry) {}
+  explicit Funclet(Thunklet* body)
+    : m_body(body) {
+  }
   Thunklet* m_body;
-  Label* m_entry;
+  Label m_entry;
+};
+
+DECLARE_BOOST_TYPES(ControlTarget);
+/*
+ * The structure represents a code path that potentially requires
+ * running finally blocks. A code path has an assigned state ID that
+ * is used inside switch statements emitted at the end of finally
+ * blocks. It also has an optional label (the destination to jump
+ * to after all the required finally blocks are run).
+ */
+struct ControlTarget {
+  static const int k_unsetState;
+  explicit ControlTarget(EmitterVisitor* router);
+  ~ControlTarget();
+  // Manage state ID reuse.
+  bool isRegistered();
+  EmitterVisitor* m_visitor;
+  // The target to jump to once all the necessary finally blocks are run.
+  Label m_label;
+  // The state ID that identifies this control target inside finally
+  // epilogues. This ID assigned to the "state" unnamed local variable.
+  int m_state;
+};
+
+struct ControlTargetInfo {
+  ControlTargetInfo() : used(false) {}
+  ControlTargetInfo(ControlTargetPtr t, bool b) : target(t), used(b) {}
+  ControlTargetPtr target;
+  bool used;
+};
+
+DECLARE_BOOST_TYPES(Region);
+/*
+ * Region represents a single level of the unified stack
+ * of constructs that are meaningful from the point of view of finally
+ * implementation. The levels are used to keep track of the information
+ * such as the control targets that can be taken inside a block.
+ */
+class Region {
+public:
+  enum Kind {
+    // Top-level (global) context.
+    Global,
+    // Function body / method body entry.
+    FuncBody,
+    // Entry for finally fault funclets emitted after the body of
+    // a function
+    FaultFunclet,
+    // Region by a finally clause
+    TryFinally,
+    // Finally block entry (begins after catches ends after finally)
+    Finally,
+    // Loop or switch statement.
+    LoopOrSwitch,
+  };
+
+  typedef Emitter::IterPair IterPair;
+  typedef std::vector<IterPair> IterVec;
+
+  Region(Region::Kind kind, RegionPtr parent);
+
+  // Helper for establishing the maximal depth of break / continue
+  // control targets that are allocated.
+  int getBreakContinueDepth();
+
+  // Returns the maximal break / continue depth admissable (aka the
+  // number of nested loops).
+  int getMaxBreakContinueDepth();
+
+  int getMaxState();
+
+  // The number of cases to be emitted. This is a helper used in
+  // establishing whether one of the optimized cases can be used.
+  int getCaseCount();
+
+  bool isForeach() { return m_iterId != -1; }
+  bool isTryFinally() { return m_kind == Region::Kind::TryFinally; }
+  bool isFinally() { return m_kind == Region::Kind::Finally; }
+
+  bool isBreakUsed(int i) {
+    auto it = m_breakTargets.find(i);
+    if (it == m_breakTargets.end()) return false;
+    return it->second.used;
+  }
+
+  bool isContinueUsed(int i) {
+    auto it = m_continueTargets.find(i);
+    if (it == m_continueTargets.end()) return false;
+    return it->second.used;
+  }
+
+  Region::Kind m_kind;
+  // Only used for loop / break kind of entries.
+  Id m_iterId;
+  IterKind m_iterKind;
+  // Because of a bug in code emission, functions sometimes have
+  // inconsistent return flavors. Therefore instead of a single
+  // return control target, there need to be one return control
+  // target per flavor used. Once the bug is removed, this code
+  // can be simplified.
+  std::map<char, ControlTargetInfo> m_returnTargets;
+  // Break and continue control targets identified by their depth.
+  std::map<int, ControlTargetInfo> m_breakTargets;
+  std::map<int, ControlTargetInfo> m_continueTargets;
+  // Goto control targets. Each goto control target is identified
+  // by the name of the destination label.
+  std::map<StringData*, ControlTargetInfo, string_data_lt> m_gotoTargets;
+  // A set of goto labels occurrning inside the statement represented
+  // by this entry. This value is used for establishing whether
+  // a finally block needs to be executed when performing gotos.
+  std::set<StringData*, string_data_lt> m_gotoLabels;
+  // The label denoting the beginning of a finally block inside the
+  // current try. Only used when the entry kind is a try statement.
+  Label m_finallyLabel;
+  // The parent entry.
+  RegionPtr m_parent;
 };
 
 class EmitterVisitor {
   friend class UnsetUnnamedLocalThunklet;
+  friend class FuncFinisher;
 public:
+  typedef std::vector<int> IndexChain;
+  typedef Emitter::IterPair IterPair;
+  typedef std::vector<IterPair> IterVec;
+
   explicit EmitterVisitor(UnitEmitter& ue);
   ~EmitterVisitor();
 
@@ -332,9 +462,10 @@ public:
   void visitKids(ConstructPtr c);
   void visit(FileScopePtr file);
   void assignLocalVariableIds(FunctionScopePtr fs);
+  void assignFinallyVariableIds();
   void fixReturnType(Emitter& e, FunctionCallPtr fn,
                      Func* builtinFunc = nullptr);
-  typedef std::vector<int> IndexChain;
+
   void visitListAssignmentLHS(Emitter& e, ExpressionPtr exp,
                               IndexChain& indexChain,
                               std::vector<IndexChain*>& chainList);
@@ -349,7 +480,7 @@ public:
   bool evalStackIsUnknown() { return m_evalStackIsUnknown; }
   void popEvalStack(char symFlavor, int arg = -1, int pos = -1);
   void popSymbolicLocal(Op opcode, int arg = -1, int pos = -1);
-  void popEvalStackLMany();
+  void popEvalStackMMany();
   void popEvalStackMany(int len, char symFlavor);
   void popEvalStackCVMany(int len);
   void pushEvalStack(char symFlavor);
@@ -370,16 +501,27 @@ public:
             || isJumpTarget(m_ue.bcPos())
             || (instrFlags(getPrevOpcode()) & TF) == 0);
   }
+  FuncEmitter* getFuncEmitter() { return m_curFunc; }
+  Id getStateLocal() {
+    assert(m_stateLocal >= 0);
+    return m_stateLocal;
+  }
+  Id getRetLocal() {
+    assert(m_retLocal >= 0);
+    return m_retLocal;
+  }
 
   class IncludeTimeFatalException : public Exception {
   public:
     ConstructPtr m_node;
+    bool m_parseFatal;
     IncludeTimeFatalException(ConstructPtr node, const char* fmt, ...)
-        : Exception(), m_node(node) {
+        : Exception(), m_node(node), m_parseFatal(false) {
       va_list ap; va_start(ap, fmt); format(fmt, ap); va_end(ap);
     }
     virtual ~IncludeTimeFatalException() throw() {}
     EXCEPTION_COMMON_IMPL(IncludeTimeFatalException);
+    void setParseFatal(bool b = true) { m_parseFatal = b; }
   };
 
   void pushIterScope(Id id, IterKind kind) {
@@ -437,36 +579,11 @@ private:
     FuncEmitter* m_fe;
   };
 
-  class ControlTargets {
+  class CatchRegion {
   public:
-    ControlTargets(Id itId, bool itRef, Label& brkTarg, Label& cntTarg)
-        : m_itId(itId), m_itRef(itRef), m_brkTarg(brkTarg), m_cntTarg(cntTarg)
-      {}
-    Id m_itId;
-    bool m_itRef;
-    Label& m_brkTarg;  // Jump here for "break;" (after doing IterFree)
-    Label& m_cntTarg;  // Jump here for "continue;"
-  };
-
-  class ControlTargetPusher {
-  public:
-    ControlTargetPusher(EmitterVisitor* e, Id itId, bool itRef, Label& brkTarg,
-        Label& cntTarg) : m_e(e) {
-      e->m_controlTargets.push_front(ControlTargets(itId, itRef, brkTarg,
-            cntTarg));
-    }
-    ~ControlTargetPusher() {
-      m_e->m_controlTargets.pop_front();
-    }
-  private:
-    EmitterVisitor* m_e;
-  };
-
-  class ExnHandlerRegion {
-  public:
-    ExnHandlerRegion(Offset start, Offset end) : m_start(start),
+    CatchRegion(Offset start, Offset end) : m_start(start),
       m_end(end) {}
-    ~ExnHandlerRegion() {
+    ~CatchRegion() {
       for (std::vector<std::pair<StringData*, Label*> >::const_iterator it =
              m_catchLabels.begin(); it != m_catchLabels.end(); it++) {
         delete it->second;
@@ -480,18 +597,22 @@ private:
 
   class FaultRegion {
   public:
-    FaultRegion(Offset start, Offset end, Id iterId, IterKind kind)
+    FaultRegion(Offset start,
+                Offset end,
+                Label* func,
+                Id iterId,
+                IterKind kind)
       : m_start(start)
       , m_end(end)
+      , m_func(func)
       , m_iterId(iterId)
-      , m_iterKind(kind)
-    {}
+      , m_iterKind(kind) {}
 
     Offset m_start;
     Offset m_end;
+    Label* m_func;
     Id m_iterId;
     IterKind m_iterKind;
-    Label m_func; // note: a pointer to this is handed out to the Funclet
   };
 
   class FPIRegion {
@@ -513,9 +634,6 @@ private:
     int defI;
   };
 
-private:
-  void emitFatal(Emitter& e, const char* message);
-
 private:
   static const size_t kMinStringSwitchCases = 8;
   UnitEmitter& m_ue;
@@ -531,7 +649,8 @@ private:
   std::deque<PostponedNonScalars> m_postponedCinits;
   std::deque<PostponedClosureCtor> m_postponedClosureCtors;
   PendingIterVec m_pendingIters;
-  hphp_hash_set<std::string> m_generatorEmitted;
+  hphp_hash_map<std::string,FuncEmitter*> m_generatorEmitted;
+  hphp_hash_set<std::string> m_nonTopGeneratorEmitted;
   hphp_hash_set<std::string> m_topMethodEmitted;
   SymbolicStack m_evalStack;
   bool m_evalStackIsUnknown;
@@ -541,23 +660,33 @@ private:
   typedef tbb::concurrent_hash_map<const StringData*, int,
                                    StringDataHashCompare> EmittedClosures;
   static EmittedClosures s_emittedClosures;
-  std::deque<ControlTargets> m_controlTargets;
-  std::deque<Funclet> m_funclets;
-  std::deque<ExnHandlerRegion*> m_exnHandlers;
+  std::deque<Funclet*> m_funclets;
+  std::map<StatementPtr, Funclet*> m_memoizedFunclets;
+  std::deque<CatchRegion*> m_catchRegions;
   std::deque<FaultRegion*> m_faultRegions;
   std::deque<FPIRegion*> m_fpiRegions;
-  std::vector<HphpArray*> m_staticArrays;
+  std::vector<Array> m_staticArrays;
   std::set<std::string,stdltistr> m_hoistables;
   LocationPtr m_tempLoc;
-  std::map<StringData*, Label, string_data_lt> m_gotoLabels;
   std::vector<Label> m_yieldLabels;
+
+  // The stack of all Regions that this EmitterVisitor is currently inside
+  std::vector<RegionPtr> m_regions;
+  // The state IDs currently allocated for the "finally router" logic.
+  // See FIXME above the registerControlTarget() method.
+  std::set<int> m_states;
+  // Unnamed local variables used by the "finally router" logic
+  Id m_stateLocal;
+  Id m_retLocal;
+
   MetaInfoBuilder m_metaInfo;
+
 public:
   bool checkIfStackEmpty(const char* forInstruction) const;
   void unexpectedStackSym(char sym, const char* where) const;
 
   int scanStackForLocation(int iLast);
-  void buildVectorImm(std::vector<uchar>& vectorImm,
+  void buildVectorImm(std::vector<unsigned char>& vectorImm,
                       int iFirst, int iLast, bool allowW,
                       Emitter& e);
   enum class PassByRefKind {
@@ -569,26 +698,20 @@ public:
   void emitAGet(Emitter& e);
   void emitCGetL2(Emitter& e);
   void emitCGetL3(Emitter& e);
+  void emitPushL(Emitter& e);
   void emitCGet(Emitter& e);
   void emitVGet(Emitter& e);
   void emitIsset(Emitter& e);
-  void emitIsNull(Emitter& e);
-  void emitIsArray(Emitter& e);
-  void emitIsObject(Emitter& e);
-  void emitIsString(Emitter& e);
-  void emitIsInt(Emitter& e);
-  void emitIsDouble(Emitter& e);
-  void emitIsBool(Emitter& e);
+  void emitIsType(Emitter& e, IsTypeOp op);
   void emitEmpty(Emitter& e);
   void emitUnset(Emitter& e, ExpressionPtr exp = ExpressionPtr());
   void emitVisitAndUnset(Emitter& e, ExpressionPtr exp);
   void emitSet(Emitter& e);
   void emitSetOp(Emitter& e, int op);
   void emitBind(Emitter& e);
-  void emitIncDec(Emitter& e, unsigned char cop);
+  void emitIncDec(Emitter& e, IncDecOp cop);
   void emitPop(Emitter& e);
   void emitConvertToCell(Emitter& e);
-  void emitFreePendingIters(Emitter& e);
   void emitConvertToCellIfVar(Emitter& e);
   void emitConvertToCellOrLoc(Emitter& e);
   void emitConvertSecondToCell(Emitter& e);
@@ -599,6 +722,7 @@ public:
   void emitResolveClsBase(Emitter& e, int pos);
   void emitClsIfSPropBase(Emitter& e);
   Id emitVisitAndSetUnnamedL(Emitter& e, ExpressionPtr exp);
+  Id emitSetUnnamedL(Emitter& e);
   void emitPushAndFreeUnnamedL(Emitter& e, Id tempLocal, Offset start);
   void emitContinuationSwitch(Emitter& e, int ncase);
   DataType analyzeSwitch(SwitchStatementPtr s, SwitchState& state);
@@ -608,7 +732,6 @@ public:
   void emitStringSwitch(Emitter& e, SwitchStatementPtr s,
                         std::vector<Label>& caseLabels, Label& done,
                         const SwitchState& state);
-  void emitIterBreak(Emitter& e, uint64_t n, Label& targ);
 
   void markElem(Emitter& e);
   void markNewElem(Emitter& e);
@@ -628,6 +751,32 @@ public:
   void postponeSinit(InterfaceStatementPtr m, FuncEmitter* fe, NonScalarVec* v);
   void postponeCinit(InterfaceStatementPtr m, FuncEmitter* fe, NonScalarVec* v);
   void emitPostponedMeths();
+  void bindUserAttributes(MethodStatementPtr meth,
+                          FuncEmitter *fe,
+                          bool &allowOverride);
+  void bindNativeFunc(MethodStatementPtr meth, FuncEmitter *fe);
+  void emitMethodMetadata(MethodStatementPtr meth,
+                          ClosureUseVarVec* useVars,
+                          bool top);
+  void fillFuncEmitterParams(FuncEmitter* fe,
+                             ExpressionListPtr params,
+                             bool builtin = false);
+  void emitMethodPrologue(Emitter& e, MethodStatementPtr meth);
+  void emitMethod(MethodStatementPtr meth);
+  std::pair<FuncEmitter*,bool> createFuncEmitterForGeneratorBody(
+                 MethodStatementPtr meth,
+                 FuncEmitter* fe,
+                 vector<FuncEmitter*>& top_fes);
+  void emitAsyncMethod(MethodStatementPtr meth);
+  void emitGeneratorCreate(MethodStatementPtr meth);
+  void emitGeneratorBody(MethodStatementPtr meth);
+  void emitConstMethodCallNoParams(Emitter& e, string name);
+  void emitCreateStaticWaitHandle(Emitter& e, std::string cls,
+                                  std::function<void()> emitParam);
+  void emitSetFuncGetArgs(Emitter& e);
+  void emitMethodDVInitializers(Emitter& e,
+                                MethodStatementPtr& meth,
+                                Label& topOfBody);
   void emitPostponedCtors();
   void emitPostponedPSinit(PostponedNonScalars& p, bool pinit);
   void emitPostponedPinits();
@@ -648,30 +797,90 @@ public:
 
   bool emitCallUserFunc(Emitter& e, SimpleFunctionCallPtr node);
   Func* canEmitBuiltinCall(const std::string& name, int numParams);
-  void emitFuncCall(Emitter& e, FunctionCallPtr node);
+  void emitFuncCall(Emitter& e, FunctionCallPtr node,
+                    const char* nameOverride = nullptr,
+                    ExpressionListPtr paramsOverride = nullptr);
   void emitFuncCallArg(Emitter& e, ExpressionPtr exp, int paramId);
   void emitBuiltinCallArg(Emitter& e, ExpressionPtr exp, int paramId,
                          bool byRef);
   void emitBuiltinDefaultArg(Emitter& e, Variant& v, DataType t, int paramId);
-  PreClass::Hoistable emitClass(Emitter& e, ClassScopePtr cNode,
-                                bool topLevel);
+  void emitClass(Emitter& e, ClassScopePtr cNode, bool topLevel);
   void emitTypedef(Emitter& e, TypedefStatementPtr);
+  void emitForeachListAssignment(Emitter& e,
+                                 ListAssignmentPtr la,
+                                 int vLocalId);
   void emitForeach(Emitter& e, ForEachStatementPtr fe);
   void emitRestoreErrorReporting(Emitter& e, Id oldLevelLoc);
-  void emitMakeUnitFatal(Emitter& e, const std::string& message);
+  void emitMakeUnitFatal(Emitter& e,
+                         const char* msg,
+                         FatalOp k = FatalOp::Runtime);
 
-  void addFunclet(Thunklet* body, Label* entry);
+  // Emits a Jmp or IterBreak instruction to the specified target, freeing
+  // the specified iterator variables. emitJump() cannot be used to leave a
+  // try region, except if it jumps to the m_finallyLabel of the try region.
+  void emitJump(Emitter& e, IterVec& iters, Label& target);
+
+  // These methods handle the return, break, continue, and goto operations.
+  // These methods are aware of try/finally blocks and foreach blocks and
+  // will free iterators and jump to finally epilogues as appropriate.
+  void emitReturn(Emitter& e, char sym, StatementPtr s);
+  void emitBreak(Emitter& e, int depth, StatementPtr s);
+  void emitContinue(Emitter& e, int depth, StatementPtr s);
+  void emitGoto(Emitter& e, StringData* name, StatementPtr s);
+
+  // Helper methods for emitting IterFree instructions
+  void emitIterFree(Emitter& e, IterVec& iters);
+  void emitIterFreeForReturn(Emitter& e);
+
+  // A "finally epilogue" is a blob of bytecode that comes after an inline
+  // copy of a "finally" clause body. Finally epilogues are used to ensure
+  // that that the bodies of finally clauses are executed whenever a return,
+  // break, continue, or goto operation jumps out of their corresponding
+  // "try" blocks.
+  void emitFinallyEpilogue(Emitter& e, Region* entry);
+  void emitReturnTrampoline(Emitter& e, Region* entry,
+                            std::vector<Label*>& cases, char sym);
+  void emitBreakTrampoline(Emitter& e, Region* entry,
+                           std::vector<Label*>& cases, int depth);
+  void emitContinueTrampoline(Emitter& e, Region* entry,
+                              std::vector<Label*>& cases, int depth);
+  void emitGotoTrampoline(Emitter& e, Region* entry,
+                          std::vector<Label*>& cases, StringData* name);
+
+  Funclet* addFunclet(Thunklet* body);
+  Funclet* addFunclet(StatementPtr stmt,
+                      Thunklet* body);
+  Funclet* getFunclet(StatementPtr stmt);
   void emitFunclets(Emitter& e);
 
   struct FaultIterInfo {
     Id iterId;
     IterKind kind;
   };
-  void newFaultRegion(Offset start, Offset end, Thunklet* t,
+
+  void newFaultRegion(Offset start,
+                      Offset end,
+                      Label* entry,
                       FaultIterInfo = FaultIterInfo { -1, KindOfIter });
+  void newFaultRegion(StatementPtr stmt,
+                      Offset start,
+                      Offset end,
+                      Label* entry,
+                      FaultIterInfo = FaultIterInfo { -1, KindOfIter });
+  void
+  newFaultRegionAndFunclet(Offset start,
+                           Offset end,
+                           Thunklet* t,
+                           FaultIterInfo = FaultIterInfo { -1, KindOfIter });
+  void
+  newFaultRegionAndFunclet(StatementPtr stmt,
+                           Offset start,
+                           Offset end,
+                           Thunklet* t,
+                           FaultIterInfo = FaultIterInfo { -1, KindOfIter });
 
   void newFPIRegion(Offset start, Offset end, Offset fpOff);
-  void copyOverExnHandlers(FuncEmitter* fe);
+  void copyOverCatchAndFaultRegions(FuncEmitter* fe);
   void copyOverFPIRegions(FuncEmitter* fe);
   void saveMaxStackCells(FuncEmitter* fe);
   void finishFunc(Emitter& e, FuncEmitter* fe);
@@ -683,11 +892,37 @@ public:
   void emitClassTraitAliasRule(PreClassEmitter* pce,
                                TraitAliasStatementPtr rule);
   void emitClassUseTrait(PreClassEmitter* pce, UseTraitStatementPtr useStmt);
+
+  // Helper function for creating entries.
+  RegionPtr createRegion(StatementPtr s, Region::Kind kind);
+  // Enter/leave the passed in entry. Note that entries sometimes need be
+  // to be constructed before they are entered, or need to be accessed
+  // after they are left. This especially applies to constructs such
+  // as loops and try blocks.
+  void enterRegion(RegionPtr);
+  void leaveRegion(RegionPtr);
+
+  // Functions used for handling state IDs allocation.
+  // FIXME (#3275259): This should be moved into global / func
+  // body / fault funclet entries in order to optimize state
+  // allocation. See the task description for more details.
+  void registerControlTarget(ControlTarget* t);
+  void unregisterControlTarget(ControlTarget* t);
+
+  void registerReturn(StatementPtr s, Region* entry, char sym);
+  void registerYieldAwait(ExpressionPtr e);
+  ControlTargetPtr registerBreak(StatementPtr s, Region* entry, int depth,
+                                 bool alloc);
+  ControlTargetPtr registerContinue(StatementPtr s, Region* entry, int depth,
+                                    bool alloc);
+  ControlTargetPtr registerGoto(StatementPtr s, Region* entry,
+                                StringData* name, bool alloc);
 };
 
 void emitAllHHBC(AnalysisResultPtr ar);
 
 extern "C" {
+  String hphp_compiler_serialize_code_model_for(String code, String prefix);
   Unit* hphp_compiler_parse(const char* code, int codeLen, const MD5& md5,
                             const char* filename);
   Unit* hphp_build_native_func_unit(const HhbcExtFuncInfo* builtinFuncs,

hphp/compiler/analysis/file_scope.cpp

@@ -13,9 +13,13 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-
 #include "hphp/compiler/analysis/file_scope.h"
+
+#include <sys/stat.h>
+#include "folly/ScopeGuard.h"
+
 #include "hphp/compiler/analysis/code_error.h"
+#include "hphp/compiler/analysis/lambda_names.h"
 #include "hphp/compiler/analysis/analysis_result.h"
 #include "hphp/compiler/analysis/class_scope.h"
 #include "hphp/compiler/statement/statement_list.h"
@@ -23,28 +27,26 @@
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/analysis/constant_table.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include <sys/stat.h>
 #include "hphp/compiler/parser/parser.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/util.h"
-#include "hphp/util/base.h"
+#include "hphp/util/deprecated/base.h"
 #include "hphp/compiler/expression/expression_list.h"
 #include "hphp/compiler/statement/function_statement.h"
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/expression/simple_function_call.h"
 #include "hphp/compiler/expression/include_expression.h"
 #include "hphp/compiler/expression/user_attribute.h"
-#include "hphp/runtime/base/complex_types.h"
+#include "hphp/runtime/base/complex-types.h"
 
-using namespace HPHP;
+namespace HPHP {
 
 ///////////////////////////////////////////////////////////////////////////////
 
 FileScope::FileScope(const string &fileName, int fileSize, const MD5 &md5)
   : BlockScope("", "", StatementPtr(), BlockScope::FileScope),
-    m_size(fileSize), m_md5(md5), m_module(false), m_privateInclude(false),
-    m_externInclude(false),
-    m_includeState(0), m_fileName(fileName), m_redeclaredFunctions(0) {
+    m_size(fileSize), m_md5(md5), m_includeState(0), m_system(false),
+    m_fileName(fileName), m_redeclaredFunctions(0) {
   pushAttribute(); // for global scope
 }
 
@@ -66,6 +68,11 @@ void FileScope::setFileLevel(StatementListPtr stmtList) {
   }
 }
 
+void FileScope::setSystem() {
+  m_fileName = "/:" + m_fileName;
+  m_system = true;
+}
+
 FunctionScopePtr FileScope::setTree(AnalysisResultConstPtr ar,
                                     StatementListPtr tree) {
   m_tree = tree;
@@ -73,8 +80,7 @@ FunctionScopePtr FileScope::setTree(AnalysisResultConstPtr ar,
   return createPseudoMain(ar);
 }
 
-void FileScope::cleanupForError(AnalysisResultConstPtr ar,
-                                int line, const string &msg) {
+void FileScope::cleanupForError(AnalysisResultConstPtr ar) {
   for (StringToClassScopePtrVecMap::const_iterator iter = m_classes.begin();
        iter != m_classes.end(); ++iter) {
     BOOST_FOREACH(ClassScopePtr cls, iter->second) {
@@ -90,8 +96,17 @@ void FileScope::cleanupForError(AnalysisResultConstPtr ar,
   StringToClassScopePtrVecMap().swap(m_classes);
   m_pseudoMain.reset();
   m_tree.reset();
+}
+
+template <class Meth>
+void makeFatalMeth(FileScope& file,
+                   AnalysisResultConstPtr ar,
+                   const std::string& msg,
+                   int line,
+                   Meth meth) {
   LocationPtr loc(new Location());
-  loc->file = m_fileName.c_str();
+  LabelScopePtr labelScope(new LabelScope());
+  loc->file = file.getName().c_str();
   loc->first(line, 0);
   loc->last(line, 0);
   BlockScopePtr scope;
@@ -100,16 +115,30 @@ void FileScope::cleanupForError(AnalysisResultConstPtr ar,
   SimpleFunctionCallPtr e(
     new SimpleFunctionCall(scope, loc, "throw_fatal", false, args,
       ExpressionPtr()));
-  e->setThrowFatal();
-  ExpStatementPtr exp(new ExpStatement(scope, loc, e));
-  StatementListPtr stmts(new StatementList(scope, loc));
+  meth(e);
+  ExpStatementPtr exp(new ExpStatement(scope, labelScope, loc, e));
+  StatementListPtr stmts(new StatementList(scope, labelScope, loc));
   stmts->addElement(exp);
 
-  FunctionScopePtr fs = setTree(ar, stmts);
-  fs->setOuterScope(shared_from_this());
+  FunctionScopePtr fs = file.setTree(ar, stmts);
+  fs->setOuterScope(file.shared_from_this());
   fs->getStmt()->resetScope(fs);
   fs->getStmt()->setLocation(loc);
-  setOuterScope(const_cast<AnalysisResult*>(ar.get())->shared_from_this());
+  file.setOuterScope(const_cast<AnalysisResult*>(ar.get())->shared_from_this());
+}
+
+void FileScope::makeFatal(AnalysisResultConstPtr ar,
+                          const std::string& msg,
+                          int line) {
+  auto meth = [](SimpleFunctionCallPtr e) { e->setThrowFatal(); };
+  makeFatalMeth(*this, ar, msg, line, meth);
+}
+
+void FileScope::makeParseFatal(AnalysisResultConstPtr ar,
+                               const std::string& msg,
+                               int line) {
+  auto meth = [](SimpleFunctionCallPtr e) { e->setThrowParseFatal(); };
+  makeFatalMeth(*this, ar, msg, line, meth);
 }
 
 bool FileScope::addFunction(AnalysisResultConstPtr ar,
@@ -193,13 +222,6 @@ int FileScope::getGlobalAttribute() const {
   return m_attributes.back();
 }
 
-bool FileScope::needPseudoMainVariables() const {
-  VariableTablePtr variables = m_pseudoMain->getVariables();
-  return
-    variables->getAttribute(VariableTable::ContainsDynamicVariable) ||
-    variables->getSymbols().size() > 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 ExpressionPtr FileScope::getEffectiveImpl(AnalysisResultConstPtr ar) const {
@@ -240,9 +262,10 @@ void FileScope::addConstantDependency(AnalysisResultPtr ar,
 }
 
 void FileScope::analyzeProgram(AnalysisResultPtr ar) {
-  if (m_pseudoMain) {
-    m_pseudoMain->getStmt()->analyzeProgram(ar);
-  }
+  if (!m_pseudoMain) return;
+  m_pseudoMain->getStmt()->analyzeProgram(ar);
+
+  resolve_lambda_names(ar, shared_from_this());
 }
 
 ClassScopeRawPtr FileScope::resolveClass(ClassScopeRawPtr cls) {
@@ -307,80 +330,80 @@ bool FileScope::insertClassUtil(AnalysisResultPtr ar,
 
 void FileScope::analyzeIncludesHelper(AnalysisResultPtr ar) {
   m_includeState = 1;
-  if (m_pseudoMain) {
-    StatementList &stmts = *getStmt();
-    bool hoistOnly = false;
-    for (int i = 0, n = stmts.getCount(); i < n; i++) {
-      StatementPtr s = stmts[i];
-      if (!s) continue;
-      if (s->is(Statement::KindOfClassStatement) ||
-          s->is(Statement::KindOfInterfaceStatement)) {
+  SCOPE_EXIT { m_includeState = 2; };
 
-        ClassScopeRawPtr cls(
-          static_pointer_cast<InterfaceStatement>(s)->getClassScope());
-        if (hoistOnly) {
-          const string &parent = cls->getOriginalParent();
-          if (cls->getBases().size() > (parent.empty() ? 0 : 1)) {
-            continue;
-          }
-          if (!parent.empty()) {
-            ClassScopeRawPtr c = ar->findClass(parent);
-            if (!c || (c->isVolatile() &&
-                       !resolveClass(c) && !checkClass(parent))) {
-              continue;
-            }
-          }
+  if (!m_pseudoMain) return;
+
+  StatementList &stmts = *getStmt();
+  bool hoistOnly = false;
+
+  for (int i = 0, n = stmts.getCount(); i < n; i++) {
+    StatementPtr s = stmts[i];
+    if (!s) continue;
+
+    if (s->is(Statement::KindOfClassStatement) ||
+        s->is(Statement::KindOfInterfaceStatement)) {
+      ClassScopeRawPtr cls(
+        static_pointer_cast<InterfaceStatement>(s)->getClassScope());
+      if (hoistOnly) {
+        const string &parent = cls->getOriginalParent();
+        if (cls->getBases().size() > (parent.empty() ? 0 : 1)) {
+          continue;
         }
-        if (cls->isVolatile()) {
-          insertClassUtil(ar, cls, true);
-        }
-        continue;
-      }
-      if (s->is(Statement::KindOfFunctionStatement)) {
-        FunctionScopeRawPtr func(
-          static_pointer_cast<FunctionStatement>(s)->getFunctionScope());
-        if (func->isVolatile()) m_providedDefs.insert(func);
-        continue;
-      }
-      if (!hoistOnly && s->is(Statement::KindOfExpStatement)) {
-        ExpressionRawPtr exp(
-          static_pointer_cast<ExpStatement>(s)->getExpression());
-        if (exp && exp->is(Expression::KindOfIncludeExpression)) {
-          FileScopeRawPtr fs(
-            static_pointer_cast<IncludeExpression>(exp)->getIncludedFile(ar));
-          if (fs && fs->m_includeState != 1) {
-            if (!fs->m_includeState) {
-              if (m_module && fs->m_privateInclude) {
-                BOOST_FOREACH(BlockScopeRawPtr bs, m_providedDefs) {
-                  fs->m_providedDefs.insert(bs);
-                }
-              }
-              fs->analyzeIncludesHelper(ar);
-            }
-            BOOST_FOREACH(BlockScopeRawPtr bs, fs->m_providedDefs) {
-              m_providedDefs.insert(bs);
-            }
+        if (!parent.empty()) {
+          ClassScopeRawPtr c = ar->findClass(parent);
+          if (!c || (c->isVolatile() &&
+                     !resolveClass(c) && !checkClass(parent))) {
             continue;
           }
         }
       }
-      hoistOnly = true;
+      if (cls->isVolatile()) {
+        insertClassUtil(ar, cls, true);
+      }
+      continue;
     }
+
+    if (s->is(Statement::KindOfFunctionStatement)) {
+      FunctionScopeRawPtr func(
+        static_pointer_cast<FunctionStatement>(s)->getFunctionScope());
+      if (func->isVolatile()) m_providedDefs.insert(func);
+      continue;
+    }
+
+    if (!hoistOnly && s->is(Statement::KindOfExpStatement)) {
+      ExpressionRawPtr exp(
+        static_pointer_cast<ExpStatement>(s)->getExpression());
+      if (exp && exp->is(Expression::KindOfIncludeExpression)) {
+        FileScopeRawPtr fs(
+          static_pointer_cast<IncludeExpression>(exp)->getIncludedFile(ar));
+        if (fs && fs->m_includeState != 1) {
+          if (!fs->m_includeState) {
+            fs->analyzeIncludesHelper(ar);
+          }
+          BOOST_FOREACH(BlockScopeRawPtr bs, fs->m_providedDefs) {
+            m_providedDefs.insert(bs);
+          }
+          continue;
+        }
+      }
+    }
+
+    hoistOnly = true;
   }
+
   m_includeState = 2;
 }
 
 void FileScope::analyzeIncludes(AnalysisResultPtr ar) {
-  if (!m_privateInclude && !m_includeState) {
+  if (!m_includeState) {
     analyzeIncludesHelper(ar);
   }
 }
 
-
 void FileScope::visit(AnalysisResultPtr ar,
                       void (*cb)(AnalysisResultPtr, StatementPtr, void*),
-                      void *data)
-{
+                      void *data) {
   if (m_pseudoMain) {
     cb(ar, m_pseudoMain->getStmt(), data);
   }
@@ -395,12 +418,15 @@ const string &FileScope::pseudoMainName() {
 
 FunctionScopePtr FileScope::createPseudoMain(AnalysisResultConstPtr ar) {
   StatementListPtr st = m_tree;
+  LabelScopePtr labelScope(new LabelScope());
   FunctionStatementPtr f
-    (new FunctionStatement(BlockScopePtr(), LocationPtr(),
+    (new FunctionStatement(BlockScopePtr(),
+                           labelScope,
+                           LocationPtr(),
                            ModifierExpressionPtr(),
                            false, pseudoMainName(),
-                           ExpressionListPtr(), "", st, 0, "",
-                           ExpressionListPtr()));
+                           ExpressionListPtr(), TypeAnnotationPtr(),
+                           st, 0, "", ExpressionListPtr()));
   f->setFileLevel();
   FunctionScopePtr pseudoMain(
     new HPHP::FunctionScope(ar, true,
@@ -432,24 +458,18 @@ string FileScope::outputFilebase() const {
 
 static void getFuncScopesSet(BlockScopeRawPtrQueue &v,
                              const StringToFunctionScopePtrMap &funcMap) {
-  for (StringToFunctionScopePtrMap::const_iterator
-         iter = funcMap.begin(), end = funcMap.end();
-       iter != end; ++iter) {
-    FunctionScopePtr f = iter->second;
-    if (f->isUserFunction()) {
+  for (const auto& iter : funcMap) {
+    FunctionScopePtr f = iter.second;
+    if (f->getStmt()) {
       v.push_back(f);
     }
   }
 }
 
 void FileScope::getScopesSet(BlockScopeRawPtrQueue &v) {
-  const StringToClassScopePtrVecMap &classes = getClasses();
-  for (StringToClassScopePtrVecMap::const_iterator iter = classes.begin(),
-         end = classes.end(); iter != end; ++iter) {
-    for (ClassScopePtrVec::const_iterator it = iter->second.begin(),
-           e = iter->second.end(); it != e; ++it) {
-      ClassScopePtr cls = *it;
-      if (cls->isUserClass()) {
+  for (const auto& clsVec : getClasses()) {
+    for (const auto cls : clsVec.second) {
+      if (cls->getStmt()) {
         v.push_back(cls);
         getFuncScopesSet(v, cls->getFunctions());
       }
@@ -457,20 +477,17 @@ void FileScope::getScopesSet(BlockScopeRawPtrQueue &v) {
   }
 
   getFuncScopesSet(v, getFunctions());
-  if (const StringToFunctionScopePtrVecMap *redec = m_redeclaredFunctions) {
-    for (StringToFunctionScopePtrVecMap::const_iterator iter = redec->begin(),
-           end = redec->end(); iter != end; ++iter) {
-      FunctionScopePtrVec::const_iterator i = iter->second.begin(),
-        e = iter->second.end();
+  if (const auto redec = m_redeclaredFunctions) {
+    for (const auto& funcVec : *redec) {
+      auto i = funcVec.second.begin(), e = funcVec.second.end();
       v.insert(v.end(), ++i, e);
     }
   }
 }
 
 void FileScope::getClassesFlattened(ClassScopePtrVec &classes) const {
-  for (StringToClassScopePtrVecMap::const_iterator it = m_classes.begin();
-       it != m_classes.end(); ++it) {
-    BOOST_FOREACH(ClassScopePtr cls, it->second) {
+  for (const auto& clsVec : m_classes) {
+    for (auto cls : clsVec.second) {
       classes.push_back(cls);
     }
   }
@@ -493,3 +510,4 @@ void FileScope::serialize(JSON::DocTarget::OutputStream &out) const {
   ms.done();
 }
 
+}

hphp/compiler/analysis/file_scope.h

@@ -17,15 +17,17 @@
 #ifndef incl_HPHP_FILE_SCOPE_H_
 #define incl_HPHP_FILE_SCOPE_H_
 
+#include <string>
 #include <map>
+#include <boost/algorithm/string.hpp>
 
 #include "hphp/compiler/analysis/block_scope.h"
 #include "hphp/compiler/analysis/function_container.h"
 #include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/code_generator.h"
 #include <boost/graph/adjacency_list.hpp>
-#include "hphp/util/json.h"
-#include "hphp/runtime/base/md5.h"
+#include "hphp/compiler/json.h"
+#include "hphp/util/md5.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -62,6 +64,7 @@ public:
     IsFoldable                = 0x1000,// function can be constant folded
     NeedsActRec               = 0x2000,// builtin function needs ActRec
     AllowOverride             = 0x4000,// allow override of systemlib or builtin
+    NeedsFinallyLocals        = 0x8000,
   };
 
   typedef boost::adjacency_list<boost::setS, boost::vecS> Graph;
@@ -77,6 +80,7 @@ public:
 
   const std::string &getName() const { return m_fileName;}
   const MD5& getMd5() const { return m_md5; }
+  void setMd5(const MD5& md5) { m_md5 = md5; }
   StatementListPtr getStmt() const { return m_tree;}
   const StringToClassScopePtrVecMap &getClasses() const {
     return m_classes;
@@ -107,8 +111,11 @@ public:
    * are the only functions a parser calls upon analysis results.
    */
   FunctionScopePtr setTree(AnalysisResultConstPtr ar, StatementListPtr tree);
-  void cleanupForError(AnalysisResultConstPtr ar,
-                       int line, const std::string &msg);
+  void cleanupForError(AnalysisResultConstPtr ar);
+  void makeFatal(AnalysisResultConstPtr ar,
+                 const std::string& msg, int line);
+  void makeParseFatal(AnalysisResultConstPtr ar,
+                      const std::string& msg, int line);
 
   bool addFunction(AnalysisResultConstPtr ar, FunctionScopePtr funcScope);
   bool addClass(AnalysisResultConstPtr ar, ClassScopePtr classScope);
@@ -138,7 +145,12 @@ public:
                              const std::string &decname);
 
   void addClassAlias(const std::string& target, const std::string& alias) {
-    m_classAliasMap.insert(std::make_pair(target, alias));
+    m_classAliasMap.insert(
+      std::make_pair(
+        boost::to_lower_copy(target),
+        boost::to_lower_copy(alias)
+      )
+    );
   }
 
   std::multimap<std::string,std::string> const& getClassAliases() const {
@@ -146,7 +158,7 @@ public:
   }
 
   void addTypeAliasName(const std::string& name) {
-    m_typeAliasNames.insert(name);
+    m_typeAliasNames.insert(boost::to_lower_copy(name));
   }
 
   std::set<std::string> const& getTypeAliasNames() const {
@@ -161,10 +173,8 @@ public:
     m_vertex = vertex;
   }
 
-  void setModule() { m_module = true; }
-  void setPrivateInclude() { m_privateInclude = true; }
-  bool isPrivateInclude() const { return m_privateInclude && !m_externInclude; }
-  void setExternInclude() { m_externInclude = true; }
+  void setSystem();
+  bool isSystem() const { return m_system; }
 
   void analyzeProgram(AnalysisResultPtr ar);
   void analyzeIncludes(AnalysisResultPtr ar);
@@ -180,32 +190,22 @@ public:
   const std::string &pseudoMainName();
   void outputFileCPP(AnalysisResultPtr ar, CodeGenerator &cg);
   bool load();
-  bool needPseudoMainVariables() const;
   std::string outputFilebase() const;
 
-  void addPseudoMainVariable(const std::string &name) {
-    m_pseudoMainVariables.insert(name);
-  }
-  std::set<std::string> &getPseudoMainVariables() {
-    return m_pseudoMainVariables;
-  }
-
   FunctionScopeRawPtr getPseudoMain() const {
     return m_pseudoMain;
   }
 
   FileScopePtr shared_from_this() {
-    return boost::static_pointer_cast<FileScope>
+    return static_pointer_cast<FileScope>
       (BlockScope::shared_from_this());
   }
 
 private:
   int m_size;
   MD5 m_md5;
-  unsigned m_module : 1;
-  unsigned m_privateInclude : 1;
-  unsigned m_externInclude : 1;
   unsigned m_includeState : 2;
+  unsigned m_system : 1;
 
   std::vector<int> m_attributes;
   std::string m_fileName;
@@ -217,7 +217,6 @@ private:
   vertex_descriptor m_vertex;
 
   std::string m_pseudoMainName;
-  std::set<std::string> m_pseudoMainVariables;
   BlockScopeSet m_providedDefs;
   std::set<std::string> m_redecBases;
 

hphp/compiler/analysis/function_container.h

@@ -24,7 +24,7 @@ namespace HPHP {
 
 class CodeGenerator;
 DECLARE_BOOST_TYPES(AnalysisResult);
-DECLARE_BOOST_TYPES(FunctionScope);
+DECLARE_EXTENDED_BOOST_TYPES(FunctionScope);
 DECLARE_BOOST_TYPES(ClassScope);
 DECLARE_BOOST_TYPES(FunctionContainer);
 

hphp/compiler/analysis/function_scope.cpp

@@ -33,12 +33,12 @@
 #include "hphp/compiler/analysis/class_scope.h"
 #include "hphp/util/atomic.h"
 #include "hphp/util/util.h"
-#include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/base/type_conversions.h"
-#include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/util/parser/hphp.tab.hpp"
-#include "hphp/runtime/base/variable_serializer.h"
-#include "hphp/runtime/base/zend/zend_string.h"
+#include "hphp/runtime/base/class-info.h"
+#include "hphp/runtime/base/type-conversions.h"
+#include "hphp/runtime/base/builtin-functions.h"
+#include "hphp/parser/hphp.tab.hpp"
+#include "hphp/runtime/base/variable-serializer.h"
+#include "hphp/runtime/base/zend-string.h"
 
 using namespace HPHP;
 
@@ -58,15 +58,17 @@ FunctionScope::FunctionScope(AnalysisResultConstPtr ar, bool method,
       m_method(method), m_refReturn(reference), m_virtual(false),
       m_hasOverride(false), m_perfectVirtual(false), m_overriding(false),
       m_volatile(false), m_persistent(false), m_pseudoMain(inPseudoMain),
-      m_magicMethod(false), m_system(false), m_inlineable(false), m_sep(false),
+      m_magicMethod(false), m_system(false), m_inlineable(false),
       m_containsThis(false), m_containsBareThis(0), m_nrvoFix(true),
       m_inlineAsExpr(false), m_inlineSameContext(false),
       m_contextSensitive(false),
       m_directInvoke(false),
-      m_closureGenerator(false), m_noLSB(false), m_nextLSB(false),
+      m_generator(false),
+      m_async(false),
+      m_noLSB(false), m_nextLSB(false),
       m_hasTry(false), m_hasGoto(false), m_localRedeclaring(false),
       m_redeclaring(-1), m_inlineIndex(0), m_optFunction(0), m_nextID(0),
-      m_yieldLabelCount(0) {
+      m_yieldLabelCount(0), m_yieldLabelGen(-1) {
   init(ar);
   for (unsigned i = 0; i < attrs.size(); ++i) {
     if (m_userAttributes.find(attrs[i]->getName()) != m_userAttributes.end()) {
@@ -89,7 +91,8 @@ FunctionScope::FunctionScope(FunctionScopePtr orig,
                              const string &name,
                              const string &originalName,
                              StatementPtr stmt,
-                             ModifierExpressionPtr modifiers)
+                             ModifierExpressionPtr modifiers,
+                             bool user)
     : BlockScope(name, orig->m_docComment, stmt,
                  BlockScope::FunctionScope),
       m_minParam(orig->m_minParam), m_maxParam(orig->m_maxParam),
@@ -101,19 +104,22 @@ FunctionScope::FunctionScope(FunctionScopePtr orig,
       m_overriding(orig->m_overriding), m_volatile(orig->m_volatile),
       m_persistent(orig->m_persistent),
       m_pseudoMain(orig->m_pseudoMain), m_magicMethod(orig->m_magicMethod),
-      m_system(orig->m_system), m_inlineable(orig->m_inlineable),
-      m_sep(orig->m_sep), m_containsThis(orig->m_containsThis),
+      m_system(!user), m_inlineable(orig->m_inlineable),
+      m_containsThis(orig->m_containsThis),
       m_containsBareThis(orig->m_containsBareThis), m_nrvoFix(orig->m_nrvoFix),
       m_inlineAsExpr(orig->m_inlineAsExpr),
       m_inlineSameContext(orig->m_inlineSameContext),
       m_contextSensitive(orig->m_contextSensitive),
       m_directInvoke(orig->m_directInvoke),
-      m_closureGenerator(orig->m_closureGenerator), m_noLSB(orig->m_noLSB),
+      m_generator(orig->m_generator),
+      m_async(orig->m_async),
+      m_noLSB(orig->m_noLSB),
       m_nextLSB(orig->m_nextLSB), m_hasTry(orig->m_hasTry),
       m_hasGoto(orig->m_hasGoto), m_localRedeclaring(orig->m_localRedeclaring),
       m_redeclaring(orig->m_redeclaring),
       m_inlineIndex(orig->m_inlineIndex), m_optFunction(orig->m_optFunction),
-      m_nextID(0), m_yieldLabelCount(orig->m_yieldLabelCount) {
+      m_nextID(0), m_yieldLabelCount(orig->m_yieldLabelCount),
+      m_yieldLabelGen(orig->m_yieldLabelGen) {
   init(ar);
   m_originalName = originalName;
   setParamCounts(ar, m_minParam, m_maxParam);
@@ -202,12 +208,14 @@ FunctionScope::FunctionScope(bool method, const std::string &name,
       m_method(method), m_refReturn(reference), m_virtual(false),
       m_hasOverride(false), m_perfectVirtual(false), m_overriding(false),
       m_volatile(false), m_persistent(false), m_pseudoMain(false),
-      m_magicMethod(false), m_system(true), m_inlineable(false), m_sep(false),
+      m_magicMethod(false), m_system(true), m_inlineable(false),
       m_containsThis(false), m_containsBareThis(0), m_nrvoFix(true),
       m_inlineAsExpr(false), m_inlineSameContext(false),
       m_contextSensitive(false),
       m_directInvoke(false),
-      m_closureGenerator(false), m_noLSB(false), m_nextLSB(false),
+      m_generator(false),
+      m_async(false),
+      m_noLSB(false), m_nextLSB(false),
       m_hasTry(false), m_hasGoto(false), m_localRedeclaring(false),
       m_redeclaring(-1), m_inlineIndex(0),
       m_optFunction(0) {
@@ -279,6 +287,15 @@ void FunctionScope::setParamSpecs(AnalysisResultPtr ar) {
   }
 }
 
+bool FunctionScope::hasUserAttr(const char *attr) const {
+  return m_userAttributes.find(attr) != m_userAttributes.end();
+}
+
+bool FunctionScope::isZendParamMode() const {
+  return m_attributeClassInfo &
+    (ClassInfo::ZendParamModeNull | ClassInfo::ZendParamModeFalse);
+}
+
 bool FunctionScope::isPublic() const {
   return m_modifiers && m_modifiers->isPublic();
 }
@@ -299,6 +316,10 @@ bool FunctionScope::isAbstract() const {
   return m_modifiers && m_modifiers->isAbstract();
 }
 
+bool FunctionScope::isNative() const {
+  return hasUserAttr("__native");
+}
+
 bool FunctionScope::isFinal() const {
   return m_modifiers && m_modifiers->isFinal();
 }
@@ -334,6 +355,11 @@ bool FunctionScope::needsActRec() const {
   return res;
 }
 
+bool FunctionScope::needsFinallyLocals() const {
+  bool res = (m_attribute & FileScope::NeedsFinallyLocals);
+  return res;
+}
+
 bool FunctionScope::mayContainThis() {
   return inPseudoMain() || getContainingClass() ||
     (isClosure() && !m_modifiers->isStatic());
@@ -343,35 +369,24 @@ bool FunctionScope::isClosure() const {
   return ParserBase::IsClosureName(name());
 }
 
-bool FunctionScope::isGenerator() const {
-  assert(!getOrigGenStmt() ||
-         (ParserBase::IsContinuationName(name()) &&
-          m_paramNames.size() == 1 &&
-          m_paramNames[0] == CONTINUATION_OBJECT_NAME));
-  return !!getOrigGenStmt();
+int FunctionScope::allocYieldLabel() {
+  assert(m_yieldLabelGen >= 0);
+  return ++m_yieldLabelCount;
 }
 
-bool FunctionScope::hasGeneratorAsBody() const {
-  MethodStatementPtr stmt = dynamic_pointer_cast<MethodStatement>(getStmt());
-  return stmt ? !!stmt->getGeneratorFunc() : false;
+int FunctionScope::getYieldLabelCount() const {
+  assert(m_yieldLabelGen >= 0);
+  return m_yieldLabelCount;
 }
 
-bool FunctionScope::isGeneratorFromClosure() const {
-  bool res = isGenerator() && getOrigGenFS()->isClosure();
-  assert(!res || getOrigGenFS()->isClosureGenerator());
-  return res;
+int FunctionScope::getYieldLabelGeneration() const {
+  assert(m_yieldLabelGen >= 0);
+  return m_yieldLabelGen;
 }
 
-MethodStatementRawPtr FunctionScope::getOrigGenStmt() const {
-  if (!getStmt()) return MethodStatementRawPtr();
-  MethodStatementPtr m =
-    dynamic_pointer_cast<MethodStatement>(getStmt());
-  return m ? m->getOrigGeneratorFunc() : MethodStatementRawPtr();
-}
-
-FunctionScopeRawPtr FunctionScope::getOrigGenFS() const {
-  MethodStatementRawPtr origStmt = getOrigGenStmt();
-  return origStmt ? origStmt->getFunctionScope() : FunctionScopeRawPtr();
+void FunctionScope::resetYieldLabelCount() {
+  ++m_yieldLabelGen;
+  m_yieldLabelCount = 0;
 }
 
 void FunctionScope::setVariableArgument(int reference) {
@@ -530,6 +545,7 @@ bool FunctionScope::mayUseVV() const {
   return (inPseudoMain() ||
           isVariableArgument() ||
           isGenerator() ||
+          isAsync() ||
           variables->getAttribute(VariableTable::ContainsDynamicVariable) ||
           variables->getAttribute(VariableTable::ContainsExtract) ||
           variables->getAttribute(VariableTable::ContainsCompact) ||
@@ -655,7 +671,8 @@ int FunctionScope::inferParamTypes(AnalysisResultPtr ar, ConstructPtr exp,
     /**
      * Duplicate the logic of getParamType(i), w/o the mutation
      */
-    TypePtr paramType(i < m_maxParam ? m_paramTypes[i] : TypePtr());
+    TypePtr paramType(i < m_maxParam && !isZendParamMode() ?
+                      m_paramTypes[i] : TypePtr());
     if (!paramType) paramType = Type::Some;
     if (valid && !canSetParamType && i < m_maxParam &&
         (!Option::HardTypeHints || !m_paramTypeSpecs[i])) {
@@ -667,8 +684,8 @@ int FunctionScope::inferParamTypes(AnalysisResultPtr ar, ConstructPtr exp,
        * expression since it'll just get converted anyways. Doing it this way
        * allows us to generate less temporaries along the way.
        */
-      TypePtr optParamType(
-          paramType->is(Type::KindOfVariant) ? Type::Some : paramType);
+      TypePtr optParamType(paramType->is(Type::KindOfVariant) ?
+                           Type::Some : paramType);
       expType = param->inferAndCheck(ar, optParamType, false);
     } else {
       expType = param->inferAndCheck(ar, Type::Some, false);
@@ -775,15 +792,10 @@ void FunctionScope::setParamName(int index, const std::string &name) {
 void FunctionScope::setParamDefault(int index, const char* value, int64_t len,
                                     const std::string &text) {
   assert(index >= 0 && index < (int)m_paramNames.size());
-  auto sd = StringData::GetStaticString(value, len);
-  m_paramDefaults[index] = String(sd);
+  m_paramDefaults[index] = std::string(value, len);
   m_paramDefaultTexts[index] = text;
 }
 
-CStrRef FunctionScope::getParamDefault(int index) {
-  return m_paramDefaults[index];
-}
-
 void FunctionScope::addModifier(int mod) {
   if (!m_modifiers) {
     m_modifiers =
@@ -836,11 +848,14 @@ bool FunctionScope::popReturnType() {
         m_prevReturn.reset();
         return false;
       }
-      if (!isFirstPass()) {
-        Logger::Verbose("Corrected function return type %s -> %s",
-                        m_prevReturn->toString().c_str(),
-                        m_returnType->toString().c_str());
-      }
+      Logger::Verbose("Corrected %s's return type %s -> %s",
+                      getFullName().c_str(),
+                      m_prevReturn->toString().c_str(),
+                      m_returnType->toString().c_str());
+    } else {
+      Logger::Verbose("Set %s's return type %s",
+                      getFullName().c_str(),
+                      m_returnType->toString().c_str());
     }
   } else if (!m_prevReturn) {
     return false;
@@ -849,7 +864,7 @@ bool FunctionScope::popReturnType() {
   m_prevReturn.reset();
   addUpdates(UseKindCallerReturn);
 #ifdef HPHP_INSTRUMENT_TYPE_INF
-  atomic_inc(RescheduleException::s_NumRetTypesChanged);
+  ++RescheduleException::s_NumRetTypesChanged;
 #endif /* HPHP_INSTRUMENT_TYPE_INF */
   return true;
 }
@@ -923,28 +938,6 @@ std::string FunctionScope::getDocFullName() const {
   return docName;
 }
 
-std::string FunctionScope::getInjectionId() const {
-  string injectionName = CodeGenerator::FormatLabel(getOriginalName());
-  MethodStatementPtr stmt =
-    dynamic_pointer_cast<MethodStatement>(getStmt());
-  assert(stmt);
-  if (stmt->getGeneratorFunc()) {
-    injectionName = isClosureGenerator() ?
-      injectionName :
-      injectionName + "{continuation}";
-  } else if (stmt->getOrigGeneratorFunc() &&
-             !getOrigGenFS()->isClosure()) {
-    injectionName = CodeGenerator::FormatLabel(
-      stmt->getOrigGeneratorFunc()->getOriginalName());
-  }
-  if (m_redeclaring < 0) {
-    return injectionName;
-  }
-  const string &redecSuffix = string(Option::IdPrefix) +
-    boost::lexical_cast<std::string>(m_redeclaring);
-  return injectionName + redecSuffix;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void FunctionScope::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
@@ -1070,7 +1063,7 @@ bool FunctionScope::needsAnonClosureClass(ParameterExpressionPtrVec &useVars) {
   useVars.clear();
   if (!isClosure()) return false;
   ParameterExpressionPtrIdxPairVec useVars0;
-  getClosureUseVars(useVars0, !m_closureGenerator);
+  getClosureUseVars(useVars0, !m_generator && !m_async);
   useVars.resize(useVars0.size());
   // C++ seems to be unable to infer the type here on pair_first_elem
   transform(useVars0.begin(),
@@ -1084,7 +1077,7 @@ bool FunctionScope::needsAnonClosureClass(
     ParameterExpressionPtrIdxPairVec &useVars) {
   useVars.clear();
   if (!isClosure()) return false;
-  getClosureUseVars(useVars, !m_closureGenerator);
+  getClosureUseVars(useVars, !m_generator && !m_async);
   return useVars.size() > 0 || getVariables()->hasStaticLocals();
 }
 

hphp/compiler/analysis/function_scope.h

@@ -20,9 +20,10 @@
 #include "hphp/compiler/expression/user_attribute.h"
 #include "hphp/compiler/analysis/block_scope.h"
 #include "hphp/compiler/option.h"
+#include "hphp/compiler/json.h"
 
-#include "hphp/util/json.h"
-#include "hphp/util/parser/parser.h"
+#include "hphp/util/hash-map-typedefs.h"
+#include "hphp/parser/parser.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -73,7 +74,7 @@ public:
 
   FunctionScope(FunctionScopePtr orig, AnalysisResultConstPtr ar,
                 const std::string &name, const std::string &originalName,
-                StatementPtr stmt, ModifierExpressionPtr modifiers);
+                StatementPtr stmt, ModifierExpressionPtr modifiers, bool user);
 
   /**
    * System functions.
@@ -84,22 +85,25 @@ public:
   void setParamName(int index, const std::string &name);
   void setParamDefault(int index, const char* value, int64_t len,
                        const std::string &text);
-  CStrRef getParamDefault(int index);
   void setRefParam(int index);
   bool hasRefParam(int max) const;
 
   void addModifier(int mod);
 
+  bool hasUserAttr(const char *attr) const;
+
   /**
    * What kind of function this is.
    */
-  bool isUserFunction() const { return !m_system;}
+  bool isUserFunction() const { return !m_system && !isNative(); }
+  bool isSystem() const { return m_system; }
   bool isDynamic() const { return m_dynamic; }
   bool isPublic() const;
   bool isProtected() const;
   bool isPrivate() const;
   bool isStatic() const;
   bool isAbstract() const;
+  bool isNative() const;
   bool isFinal() const;
   bool isMagic() const;
   bool isRefParam(int index) const;
@@ -109,20 +113,18 @@ public:
   bool hasImpl() const;
   void setDirectInvoke() { m_directInvoke = true; }
   bool hasDirectInvoke() const { return m_directInvoke; }
+  bool isZendParamMode() const;
   bool mayContainThis();
   bool isClosure() const;
-  bool isGenerator() const;
-  bool isGeneratorFromClosure() const;
-  int allocYieldLabel() { return ++m_yieldLabelCount; }
-  int getYieldLabelCount() const { return m_yieldLabelCount; }
-  bool hasGeneratorAsBody() const;
-  MethodStatementRawPtr getOrigGenStmt() const;
-  FunctionScopeRawPtr getOrigGenFS() const;
-  void setClosureGenerator() { m_closureGenerator = true; }
-  bool isClosureGenerator() const {
-    assert(!m_closureGenerator || isClosure());
-    return m_closureGenerator;
-  }
+  bool isGenerator() const { return m_generator; }
+  void setGenerator(bool f) { m_generator = f; }
+  int allocYieldLabel();
+  int getYieldLabelCount() const;
+  int getYieldLabelGeneration() const;
+  void resetYieldLabelCount();
+  bool isAsync() const { return m_async; }
+  void setAsync(bool f) { m_async = f; }
+
   bool needsClassParam();
 
   void setInlineSameContext(bool f) { m_inlineSameContext = f; }
@@ -158,7 +160,6 @@ public:
   }
 
   virtual std::string getId() const;
-  std::string getInjectionId() const;
 
   int getRedeclaringId() const {
     return m_redeclaring;
@@ -227,6 +228,8 @@ public:
   bool allowOverride() const;
   void setAllowOverride();
 
+  bool needsFinallyLocals() const;
+
   /**
    * Whether this function is a runtime helper function
    */
@@ -254,6 +257,8 @@ public:
 
   /**
    * What is the inferred type of this function's return.
+   * Note that for generators and async functions, this is different
+   * from what caller actually gets when calling the function.
    */
   void pushReturnType();
   void setReturnType(AnalysisResultConstPtr ar, TypePtr type);
@@ -308,10 +313,6 @@ public:
   bool isInlined() const { return m_inlineable; }
   void disableInline() { m_inlineable = false; }
 
-  /* Whether this function is brought in by a separable extension */
-  void setSepExtension() { m_sep = true;}
-  bool isSepExtension() const { return m_sep;}
-
   /* Whether we need to worry about the named return value optimization
      for this function */
   void setNRVOFix(bool flag) { m_nrvoFix = flag; }
@@ -388,7 +389,7 @@ public:
 
   ReadWriteMutex &getInlineMutex() { return m_inlineMutex; }
 
-  DECLARE_BOOST_TYPES(FunctionInfo);
+  DECLARE_EXTENDED_BOOST_TYPES(FunctionInfo);
 
   static void RecordFunctionInfo(std::string fname, FunctionScopePtr func);
 
@@ -440,7 +441,7 @@ private:
   std::vector<std::string> m_paramNames;
   TypePtrVec m_paramTypes;
   TypePtrVec m_paramTypeSpecs;
-  std::vector<String> m_paramDefaults;
+  std::vector<std::string> m_paramDefaults;
   std::vector<std::string> m_paramDefaultTexts;
   std::vector<bool> m_refs;
   TypePtr m_returnType;
@@ -463,7 +464,6 @@ private:
   unsigned m_magicMethod : 1;
   unsigned m_system : 1;
   unsigned m_inlineable : 1;
-  unsigned m_sep : 1;
   unsigned m_containsThis : 1; // contains a usage of $this?
   unsigned m_containsBareThis : 2; // $this outside object-context,
                                    // 2 if in reference context
@@ -472,7 +472,8 @@ private:
   unsigned m_inlineSameContext : 1;
   unsigned m_contextSensitive : 1;
   unsigned m_directInvoke : 1;
-  unsigned m_closureGenerator : 1;
+  unsigned m_generator : 1;
+  unsigned m_async : 1;
   unsigned m_noLSB : 1;
   unsigned m_nextLSB : 1;
   unsigned m_hasTry : 1;
@@ -489,6 +490,7 @@ private:
   ReadWriteMutex m_inlineMutex;
   unsigned m_nextID; // used when cloning generators for traits
   int m_yieldLabelCount; // number of allocated yield labels
+  int m_yieldLabelGen;   // generation counter for yield labels
   std::list<FunctionScopeRawPtr> m_clonedTraitOuterScope;
 };
 

hphp/compiler/analysis/label_scope.h

@@ -0,0 +1,59 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef incl_HPHP_LABEL_SCOPE_H_
+#define incl_HPHP_LABEL_SCOPE_H_
+
+#include "hphp/compiler/hphp.h"
+#include "hphp/util/deprecated/base.h"
+
+#include <vector>
+#include <string>
+
+namespace HPHP {
+///////////////////////////////////////////////////////////////////////////////
+
+class Statement;
+
+DECLARE_BOOST_TYPES(Statement);
+
+class LabelScope {
+public:
+  class LabelInfo {
+  public:
+    LabelInfo(StatementPtr s, const std::string& name)
+      : m_stmt(s), m_name(name) {}
+
+    StatementPtr getStatement() const { return m_stmt; }
+    const std::string& getName() const { return m_name; }
+
+  private:
+    StatementPtr m_stmt;
+    std::string m_name;
+  };
+
+  const std::vector<LabelInfo>& getLabels() const { return m_labels; }
+  void addLabel(StatementPtr s, const std::string& label) {
+    m_labels.push_back(LabelInfo(s, label));
+  }
+
+private:
+  std::vector<LabelInfo> m_labels;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+}
+#endif // incl_HPHP_LABEL_SCOPE_H_

hphp/compiler/analysis/lambda_names.cpp

@@ -0,0 +1,156 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+#include "hphp/compiler/analysis/lambda_names.h"
+
+#include <set>
+
+#include "folly/ScopeGuard.h"
+
+#include "hphp/compiler/analysis/variable_table.h"
+#include "hphp/compiler/analysis/function_scope.h"
+#include "hphp/compiler/statement/method_statement.h"
+#include "hphp/compiler/statement/function_statement.h"
+#include "hphp/compiler/expression/closure_expression.h"
+
+namespace HPHP {
+
+//////////////////////////////////////////////////////////////////////
+
+namespace {
+
+struct NameScope {
+  NameScope* const prev;
+  VariableTablePtr const vars;
+};
+
+struct Walker {
+  explicit Walker(AnalysisResultPtr ar)
+    : m_curScope{nullptr}
+    , m_ar{ar}
+  {}
+
+  void walk_functions(const FunctionContainer& funcCont) {
+    for (auto& kv : funcCont.getFunctions()) {
+      walk_function(kv.second);
+    }
+  }
+
+private:
+  void visit_closure(ClosureExpressionPtr ce) {
+    auto const cfunc = ce->getClosureFunction();
+
+    with_scope(
+      cfunc->getScope()->getVariables(),
+      [&] {
+        walk_ast(cfunc->getStmts());
+      }
+    );
+
+    if (ce->type() != ClosureType::Short) return;
+    if (ce->captureState() == ClosureExpression::CaptureState::Known) {
+      return;
+    }
+
+    auto const paramNames = ce->collectParamNames();
+    std::set<std::string> mentioned;
+    cfunc->getScope()->getVariables()->getNames(mentioned);
+
+    std::set<std::string> toCapture;
+
+    for (auto& m : mentioned) {
+      if (paramNames.count(m)) continue;
+      if (m == "this") {
+        toCapture.insert("this");
+        continue;
+      }
+      for (auto scope = m_curScope; scope; scope = scope->prev) {
+        if (scope->vars->getSymbol(m)) {
+          toCapture.insert(m);
+          break;
+        }
+      }
+    }
+
+    if (cfunc->getFunctionScope()->containsThis()) {
+      toCapture.insert("this");
+    }
+
+    ce->setCaptureList(m_ar, toCapture);
+  }
+
+  void walk_ast(ConstructPtr node) {
+    if (!node) return;
+
+    if (dynamic_pointer_cast<MethodStatement>(node)) {
+      // Don't descend into nested non-closure functions, or functions
+      // in the psuedo-main.
+      return;
+    }
+
+    if (auto ce = dynamic_pointer_cast<ClosureExpression>(node)) {
+      visit_closure(ce);
+      return;
+    }
+
+    for (int i = 0; i < node->getKidCount(); ++i) {
+      walk_ast(node->getNthKid(i));
+    }
+  }
+
+  void walk_function(const FunctionScopePtr& fscope) {
+    if (fscope->isClosure()) return;
+    auto ms = dynamic_pointer_cast<MethodStatement>(fscope->getStmt());
+
+    ConstructPtr node(ms->getStmts());
+    with_scope(
+      fscope->getVariables(),
+      [&] {
+        walk_ast(node);
+      }
+    );
+  }
+
+  template<class Func>
+  void with_scope(const VariableTablePtr& scopeVars, Func func) {
+    auto newScope = NameScope { m_curScope, scopeVars };
+    m_curScope = &newScope;
+    SCOPE_EXIT { m_curScope = m_curScope->prev; };
+    func();
+  }
+
+private:
+  NameScope* m_curScope;
+  AnalysisResultPtr m_ar;
+};
+
+}
+
+//////////////////////////////////////////////////////////////////////
+
+void resolve_lambda_names(AnalysisResultPtr ar, const FileScopePtr& fscope) {
+  Walker walker(ar);
+
+  ClassScopePtrVec classScopes;
+  fscope->getClassesFlattened(classScopes);
+  for (auto& cls : classScopes) {
+    walker.walk_functions(*cls);
+  }
+  walker.walk_functions(*fscope);
+}
+
+//////////////////////////////////////////////////////////////////////
+
+}

hphp/compiler/analysis/lambda_names.h

@@ -0,0 +1,39 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef incl_HPHP_COMPILER_ANALYSIS_LAMBDA_NAMES_H_
+#define incl_HPHP_COMPILER_ANALYSIS_LAMBDA_NAMES_H_
+
+#include "hphp/compiler/statement/statement_list.h"
+#include "hphp/compiler/analysis/file_scope.h"
+#include "hphp/compiler/analysis/analysis_result.h"
+
+namespace HPHP {
+
+//////////////////////////////////////////////////////////////////////
+
+/*
+ * After the first analysis pass over a file, this pass must run to
+ * resolve names for lambda expressions and determine their automatic
+ * capture lists.
+ */
+void resolve_lambda_names(AnalysisResultPtr ar, const FileScopePtr&);
+
+//////////////////////////////////////////////////////////////////////
+
+}
+
+#endif

hphp/compiler/analysis/live_dict.cpp

@@ -14,9 +14,10 @@
    +----------------------------------------------------------------------+
 */
 
+#include "hphp/compiler/analysis/live_dict.h"
+
 #include "hphp/compiler/analysis/alias_manager.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include "hphp/compiler/analysis/live_dict.h"
 #include "hphp/compiler/analysis/variable_table.h"
 
 #include "hphp/compiler/expression/expression.h"
@@ -465,7 +466,6 @@ bool LiveDict::color(TypePtr type) {
         if (sym &&
             !sym->isGlobal() &&
             !sym->isParameter() &&
-            !sym->isGeneratorParameter() &&
             !sym->isClosureVar() &&
             !sym->isStatic() &&
             !e->isThis()) {
@@ -610,7 +610,7 @@ public:
       SimpleVariablePtr sv(static_pointer_cast<SimpleVariable>(e));
       Symbol *sym = sv->getSymbol();
       if (!sym || sym->isGlobal() || sym->isStatic() || sym->isParameter() ||
-          sym->isGeneratorParameter() || sym->isClosureVar() || sv->isThis()) {
+          sym->isClosureVar() || sv->isThis()) {
         continue;
       }
 
@@ -623,7 +623,8 @@ public:
       e->setLocation(sub->getLocation());
       e->setBlockScope(sub->getScope());
       ExpStatementPtr exp(
-          new ExpStatement(sub->getScope(), sub->getLocation(), e));
+          new ExpStatement(sub->getScope(), sub->getLabelScope(),
+                           sub->getLocation(), e));
       sl->insertElement(exp, ix);
     }
   }

hphp/compiler/analysis/peephole.cpp

@@ -24,7 +24,7 @@ namespace HPHP { namespace Compiler {
 static void collapseJmp(Offset* offsetPtr, Op* instr, Op* start) {
   if (offsetPtr) {
     Op* dest = instr + *offsetPtr;
-    while (*dest == OpJmp && dest != instr) {
+    while (isUnconditionalJmp(*dest) && dest != instr) {
       dest = start + instrJumpTarget(start, dest - start);
     }
     *offsetPtr = dest - instr;
@@ -91,10 +91,10 @@ Peephole::Peephole(UnitEmitter &ue, MetaInfoBuilder& metaInfo)
           // fallthrough
 
         incDecOp:
-          if (imm->u_OA == PostInc) {
-            imm->u_OA = PreInc;
-          } else if (imm->u_OA == PostDec) {
-            imm->u_OA = PreDec;
+          if (static_cast<IncDecOp>(imm->u_OA) == IncDecOp::PostInc) {
+            imm->u_OA = static_cast<unsigned char>(IncDecOp::PreInc);
+          } else if (static_cast<IncDecOp>(imm->u_OA) == IncDecOp::PostDec) {
+            imm->u_OA = static_cast<unsigned char>(IncDecOp::PreDec);
           }
           break;
         default:

hphp/compiler/analysis/ref_dict.cpp

@@ -14,9 +14,9 @@
    +----------------------------------------------------------------------+
 */
 
+#include "hphp/compiler/analysis/ref_dict.h"
 #include "hphp/compiler/analysis/alias_manager.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include "hphp/compiler/analysis/ref_dict.h"
 
 #include "hphp/compiler/expression/expression.h"
 #include "hphp/compiler/expression/assignment_expression.h"
@@ -29,7 +29,7 @@
 #include "hphp/compiler/statement/method_statement.h"
 #include "hphp/compiler/statement/statement_list.h"
 
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/parser/hphp.tab.hpp"
 
 using namespace HPHP;
 using std::vector;
@@ -74,10 +74,10 @@ void RefDict::visit(ExpressionPtr e) {
   SimpleVariablePtr ptr(static_pointer_cast<SimpleVariable>(e));
 
   if (ptr->isSuperGlobal() || ptr->isThis()) {
-    // don't both recording for super globals or this 
+    // don't both recording for super globals or this
     return;
   }
-  
+
   // Good to go
   if (m_am.insertForDict(e)) {
     record(e);
@@ -129,7 +129,7 @@ void RefDict::updateParams() {
         bool isRef;
         if (sym->isParameter()) {
           ExpressionListPtr methodParams = m_method_stmt->getParams();
-          ExpressionPtr paramExprPtr = 
+          ExpressionPtr paramExprPtr =
               (*methodParams)[sym->getParameterIndex()];
           paramType = paramExprPtr->getType();
           isRef = m_method_stmt->isRef(sym->getParameterIndex());
@@ -160,7 +160,7 @@ void RefDict::updateParams() {
 
 void RefDict::updateAccess(ExpressionPtr e) {
   always_assert(!e->getScope()->inPseudoMain());
-  
+
   int eid     = e->getCanonID();
   int context = e->getContext();
 
@@ -204,7 +204,7 @@ void RefDict::updateAccess(ExpressionPtr e) {
              context & Expression::UnsetContext) {
     BitOps::set_bit(eid, m_referenced, false);
     BitOps::set_bit(eid, m_killed, true);
-  } 
+  }
 
   if (first_pass) return;
 
@@ -215,7 +215,7 @@ void RefDict::updateAccess(ExpressionPtr e) {
     // we dealt with this node as a store expression
     return;
   }
-  
+
   int cls = e->getExprClass();
 
   bool isRhsNeeded = false;
@@ -227,7 +227,7 @@ void RefDict::updateAccess(ExpressionPtr e) {
   if (cls & Expression::Store) {
     // we care about two cases here
     switch (e->getKindOf()) {
-      case Expression::KindOfAssignmentExpression: 
+      case Expression::KindOfAssignmentExpression:
         // $x = ...
         {
           AssignmentExpressionPtr assign(
@@ -254,7 +254,7 @@ void RefDict::updateAccess(ExpressionPtr e) {
         break;
     }
   }
-  
+
   bool isLhsSimpleVar = false;
   bool isLhsDynamic   = false;
   bool isRefd         = false;
@@ -343,20 +343,20 @@ void RefDict::updateAccess(ExpressionPtr e) {
       // unset($x);
       BitOps::set_bit(eid, m_obj, false);
       BitOps::set_bit(eid, m_noobj, true);
-    } else if (isRefd || 
+    } else if (isRefd ||
         ((context & Expression::Declaration) == Expression::Declaration)) {
       // if a simple variable has isRefd, then we need to mark it
       // as potentially containing an object.
-      // also, if the simple variable is in global context 
+      // also, if the simple variable is in global context
       // then we also mark it as potentially containing an object
       BitOps::set_bit(eid, m_obj, true);
       BitOps::set_bit(eid, m_noobj, false);
-    }  
+    }
   }
 
   if (isRefd) {
-    // do a scan for every simple variable referenced value 
-    // in the dictionary and mark it as potentially 
+    // do a scan for every simple variable referenced value
+    // in the dictionary and mark it as potentially
     // containing an object (in the bit vector)
     for (int i = size(); i--; ) {
       if (ExpressionPtr e = get(i)) {
@@ -372,8 +372,8 @@ void RefDict::updateAccess(ExpressionPtr e) {
 }
 
 int RefDictWalker::after(ConstructRawPtr cp) {
-  if (SimpleVariableRawPtr s = 
-      boost::dynamic_pointer_cast<SimpleVariable>(cp)) {
+  if (SimpleVariableRawPtr s =
+      dynamic_pointer_cast<SimpleVariable>(cp)) {
     if (int id = s->getCanonID()) {
       if (first_pass) {
         if (s->isAvailable() && m_block->getBit(DataFlow::PRefIn, id)) {

hphp/compiler/analysis/symbol_table.cpp

@@ -27,9 +27,9 @@
 #include "hphp/compiler/expression/parameter_expression.h"
 #include "hphp/compiler/expression/simple_variable.h"
 
-#include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/base/complex_types.h"
-#include "hphp/runtime/base/variable_serializer.h"
+#include "hphp/runtime/base/class-info.h"
+#include "hphp/runtime/base/complex-types.h"
+#include "hphp/runtime/base/variable-serializer.h"
 
 #include "hphp/util/logger.h"
 
@@ -65,13 +65,13 @@ TypePtr Symbol::setType(AnalysisResultConstPtr ar, BlockScopeRawPtr scope,
     // at this point, you *must* have a lock (if you are user scope)
     if (scope->is(BlockScope::FunctionScope)) {
       FunctionScopeRawPtr f =
-        boost::static_pointer_cast<FunctionScope>(scope);
+        static_pointer_cast<FunctionScope>(scope);
       if (f->isUserFunction()) {
         f->getInferTypesMutex().assertOwnedBySelf();
       }
     } else if (scope->is(BlockScope::ClassScope)) {
       ClassScopeRawPtr c =
-        boost::static_pointer_cast<ClassScope>(scope);
+        static_pointer_cast<ClassScope>(scope);
       if (c->isUserClass()) {
         c->getInferTypesMutex().assertOwnedBySelf();
       }
@@ -520,17 +520,6 @@ ConstructPtr SymbolTable::getValue(const std::string &name) const {
   return ConstructPtr();
 }
 
-void SymbolTable::setSepExtension(const std::string &name) {
-  genSymbol(name, m_const)->setSep();
-}
-
-bool SymbolTable::isSepExtension(const std::string &name) const {
-  if (const Symbol *sym = getSymbol(name)) {
-    return sym->isSep();
-  }
-  return false;
-}
-
 TypePtr SymbolTable::setType(AnalysisResultConstPtr ar, const std::string &name,
                              TypePtr type, bool coerced) {
   return setType(ar, genSymbol(name, m_const), type, coerced);

hphp/compiler/analysis/symbol_table.h

@@ -18,9 +18,10 @@
 #define incl_HPHP_SYMBOL_TABLE_H_
 
 #include "hphp/compiler/hphp.h"
-#include "hphp/util/json.h"
+#include "hphp/compiler/json.h"
 #include "hphp/util/util.h"
 #include "hphp/util/lock.h"
+#include "hphp/util/hash-map-typedefs.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,7 +30,7 @@ class BlockScope;
 class CodeGenerator;
 class Variant;
 DECLARE_BOOST_TYPES(Construct);
-DECLARE_BOOST_TYPES(Type);
+DECLARE_EXTENDED_BOOST_TYPES(Type);
 DECLARE_BOOST_TYPES(AnalysisResult);
 DECLARE_BOOST_TYPES(SymbolTable);
 DECLARE_BOOST_TYPES(FunctionScope);
@@ -74,9 +75,7 @@ public:
   void setReplaced() { m_flags.m_replaced = true; }
   bool valueSet() const { return m_flags.m_value_set; }
   bool isSystem() const { return m_flags.m_system; }
-  bool isSep() const { return m_flags.m_sep; }
   void setSystem() { m_flags.m_system = true; }
-  void setSep() { m_flags.m_sep = true; }
   bool isConstant() const { return m_flags.m_constant; }
   void setConstant() { m_flags.m_constant = true; }
 
@@ -115,8 +114,6 @@ public:
   bool isIndirectAltered() const { return m_flags.m_indirectAltered; }
   bool isReferenced() const { return !m_flags.m_notReferenced; }
   bool isHidden() const { return m_flags.m_hidden; }
-  bool isGeneratorParameter() const { return m_flags.m_generatorParameter; }
-  bool isRefGeneratorParameter() const { return m_flags.m_refGeneratorParameter; }
   bool isClosureVar() const { return m_flags.m_closureVar; }
   bool isRefClosureVar() const { return m_flags.m_refClosureVar; }
   bool isPassClosureVar() const { return m_flags.m_passClosureVar; }
@@ -142,8 +139,6 @@ public:
   void setIndirectAltered() { m_flags.m_indirectAltered = true; }
   void setReferenced() { m_flags.m_notReferenced = false; }
   void setHidden() { m_flags.m_hidden = true; }
-  void setGeneratorParameter() { m_flags.m_generatorParameter = true; }
-  void setRefGeneratorParameter() { m_flags.m_refGeneratorParameter = true; }
   void setClosureVar() { m_flags.m_closureVar = true; }
   void setRefClosureVar() { m_flags.m_refClosureVar = true; }
   void setPassClosureVar() { m_flags.m_passClosureVar = true; }
@@ -189,7 +184,7 @@ private:
   std::string  m_name;
   unsigned int m_hash;
   union {
-    uint64_t m_flags_val;
+    uint32_t m_flags_val;
     struct {
       /* internal */
       unsigned m_declaration_set : 1;
@@ -200,7 +195,6 @@ private:
 
       /* common */
       unsigned m_system : 1;
-      unsigned m_sep : 1;
 
       /* ConstantTable */
       unsigned m_dynamic : 1;
@@ -223,8 +217,6 @@ private:
       unsigned m_indirectAltered : 1;
       unsigned m_notReferenced : 1;
       unsigned m_hidden : 1;
-      unsigned m_generatorParameter : 1;
-      unsigned m_refGeneratorParameter : 1;
       unsigned m_closureVar : 1;
       unsigned m_refClosureVar : 1;
       unsigned m_passClosureVar : 1;
@@ -281,7 +273,7 @@ private:
 /**
  * Base class of VariableTable and ConstantTable.
  */
-class SymbolTable : public boost::enable_shared_from_this<SymbolTable>,
+class SymbolTable : public std::enable_shared_from_this<SymbolTable>,
                     public JSON::CodeError::ISerializable {
 public:
   static Mutex AllSymbolTablesMutex;
@@ -347,10 +339,6 @@ public:
   ConstructPtr getDeclaration(const std::string &name) const;
   ConstructPtr getValue(const std::string &name) const;
 
-  /* Whether this constant is brought in by a separable extension */
-  void setSepExtension(const std::string &name);
-  bool isSepExtension(const std::string &name) const;
-
   /**
    * How big of a hash table for generate C++ switch statements.
    */

hphp/compiler/analysis/type.cpp

@@ -20,7 +20,8 @@
 #include "hphp/compiler/analysis/class_scope.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/expression/expression.h"
-#include "hphp/runtime/base/builtin_functions.h"
+#include "hphp/runtime/base/builtin-functions.h"
+#include "hphp/runtime/vm/runtime.h"
 #include <boost/format.hpp>
 
 using namespace HPHP;
@@ -36,6 +37,7 @@ TypePtr Type::Double      (new Type(Type::KindOfDouble      ));
 TypePtr Type::String      (new Type(Type::KindOfString      ));
 TypePtr Type::Array       (new Type(Type::KindOfArray       ));
 TypePtr Type::Object      (new Type(Type::KindOfObject      ));
+TypePtr Type::Resource    (new Type(Type::KindOfResource    ));
 TypePtr Type::Variant     (new Type(Type::KindOfVariant     ));
 
 TypePtr Type::Numeric     (new Type(Type::KindOfNumeric     ));
@@ -57,6 +59,8 @@ void Type::InitTypeHintMap() {
   assert(s_HHTypeHintTypes.empty());
 
   s_TypeHintTypes["array"] = Type::Array;
+  s_TypeHintTypes["resource"] = Type::Resource;
+  s_TypeHintTypes["callable"] = Type::Variant;
 
   s_HHTypeHintTypes["array"] = Type::Array;
   s_HHTypeHintTypes["bool"]    = Type::Boolean;
@@ -67,6 +71,10 @@ void Type::InitTypeHintMap() {
   s_HHTypeHintTypes["double"]  = Type::Double;
   s_HHTypeHintTypes["float"]   = Type::Double;
   s_HHTypeHintTypes["string"]  = Type::String;
+  // Type::Numeric doesn't include numeric strings; this is intentional
+  s_HHTypeHintTypes["num"]      = Type::Numeric;
+  s_HHTypeHintTypes["resource"] = Type::Resource;
+  s_HHTypeHintTypes["callable"] = Type::Variant;
 }
 
 const Type::TypePtrMap &Type::GetTypeHintTypes(bool hhType) {
@@ -79,9 +87,12 @@ void Type::ResetTypeHintTypes() {
 }
 
 TypePtr Type::CreateObjectType(const std::string &clsname) {
-  // For interfaces that support arrays we're pessimistic and
+  // For interfaces that support primitive types, we're pessimistic and
   // we treat it as a Variant
-  if (interface_supports_array(clsname)) {
+  if (interface_supports_array(clsname) ||
+      interface_supports_string(clsname) ||
+      interface_supports_int(clsname) ||
+      interface_supports_double(clsname)) {
     return Type::Variant;
   }
   return TypePtr(new Type(KindOfObject, clsname));
@@ -90,9 +101,12 @@ TypePtr Type::CreateObjectType(const std::string &clsname) {
 TypePtr Type::GetType(KindOf kindOf, const std::string &clsname /* = "" */) {
   assert(kindOf);
   if (!clsname.empty()) {
-    // For interfaces that support arrays we're pessimistic and
+    // For interfaces that support primitive types we're pessimistic and
     // we treat it as a Variant
-    if (interface_supports_array(clsname)) {
+    if (interface_supports_array(clsname) ||
+        interface_supports_string(clsname) ||
+        interface_supports_int(clsname) ||
+        interface_supports_double(clsname)) {
       return Type::Variant;
     }
     return TypePtr(new Type(kindOf, clsname));
@@ -107,6 +121,7 @@ TypePtr Type::GetType(KindOf kindOf, const std::string &clsname /* = "" */) {
   case KindOfArray:       return Type::Array;
   case KindOfVariant:     return Type::Variant;
   case KindOfObject:      return Type::Object;
+  case KindOfResource:    return Type::Resource;
   case KindOfNumeric:     return Type::Numeric;
   case KindOfPrimitive:   return Type::Primitive;
   case KindOfPlusOperand: return Type::PlusOperand;
@@ -193,6 +208,7 @@ bool Type::IsMappedToVariant(TypePtr t) {
   case KindOfString :
   case KindOfArray  :
   case KindOfObject :
+  case KindOfResource:
     return false;
   default: break;
   }
@@ -261,7 +277,8 @@ TypePtr Type::Coerce(AnalysisResultConstPtr ar, TypePtr type1, TypePtr type2) {
   if (type1->m_kindOf == KindOfVoid &&
       (type2->m_kindOf == KindOfString ||
        type2->m_kindOf == KindOfArray ||
-       type2->m_kindOf == KindOfObject)) {
+       type2->m_kindOf == KindOfObject ||
+       type2->m_kindOf == KindOfResource)) {
     return type2;
   }
   if (type2->m_kindOf == KindOfSome ||
@@ -396,6 +413,7 @@ bool Type::HasFastCastMethod(TypePtr t) {
   case Type::KindOfString:
   case Type::KindOfArray:
   case Type::KindOfObject:
+  case Type::KindOfResource:
     return true;
   default: break;
   }
@@ -441,6 +459,9 @@ string Type::GetFastCastMethod(
   case Type::KindOfObject:
     type = "Obj";
     break;
+  case Type::KindOfResource:
+    type = "Res";
+    break;
   default:
     type = ""; // make the compiler happy
     assert(false);
@@ -536,11 +557,13 @@ bool Type::isSpecificObject() const {
 }
 
 bool Type::isNonConvertibleType() const {
-  return m_kindOf == KindOfObject || m_kindOf == KindOfArray;
+  return m_kindOf == KindOfObject || m_kindOf == KindOfResource ||
+         m_kindOf == KindOfArray;
 }
 
 bool Type::isNoObjectInvolved() const {
   if (couldBe(KindOfObject)
+   || couldBe(KindOfResource)
    || couldBe(KindOfArray))
     return false;
   else
@@ -614,6 +637,7 @@ DataType Type::getDataType() const {
     case KindOfString:      return HPHP::KindOfString;
     case KindOfArray:       return HPHP::KindOfArray;
     case KindOfObject:      return HPHP::KindOfObject;
+    case KindOfResource:    return HPHP::KindOfResource;
     case KindOfNumeric:
     case KindOfPrimitive:
     case KindOfPlusOperand:
@@ -635,6 +659,7 @@ std::string Type::getPHPName() {
   switch (m_kindOf) {
   case KindOfArray:       return "array";
   case KindOfObject:      return m_name;
+  case KindOfResource:    return "resource";
   default: break;
   }
   return "";
@@ -652,6 +677,7 @@ std::string Type::toString() const {
   case KindOfSome:        return "Some";
   case KindOfAny:         return "Any";
   case KindOfObject:      return string("Object - ") + m_name;
+  case KindOfResource:    return "Resource";
   case KindOfNumeric:     return "Numeric";
   case KindOfPrimitive:   return "Primitive";
   case KindOfPlusOperand: return "PlusOperand";
@@ -700,6 +726,7 @@ void Type::serialize(JSON::DocTarget::OutputStream &out) const {
     }
     break;
   }
+  case KindOfResource:    s = "resource"; break;
   case KindOfNumeric:     s = "numeric"; break;
   case KindOfPrimitive:   s = "primitive"; break;
   case KindOfPlusOperand: s = "any"; break;

hphp/compiler/analysis/type.h

@@ -18,8 +18,8 @@
 #define incl_HPHP_TYPE_H_
 
 #include "hphp/compiler/hphp.h"
-#include "hphp/util/json.h"
-#include "hphp/util/case_insensitive.h"
+#include "hphp/compiler/json.h"
+#include "hphp/util/functional.h"
 #include "hphp/runtime/base/types.h"
 
 
@@ -53,6 +53,7 @@ public:
   static const KindOf KindOfString     = 0x0080;
   static const KindOf KindOfArray      = 0x0100;
   static const KindOf KindOfObject     = 0x0200;   // with classname
+  static const KindOf KindOfResource   = 0x0400;
   static const KindOf KindOfVariant    = 0xFFFF;
 
   /* This bit tells coerce that if the other type
@@ -88,6 +89,7 @@ public:
   static TypePtr String;
   static TypePtr Array;
   static TypePtr Object;
+  static TypePtr Resource;
   static TypePtr Variant;
 
   static TypePtr Numeric;

hphp/compiler/analysis/variable_table.cpp

@@ -27,11 +27,12 @@
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/expression/simple_function_call.h"
 #include "hphp/compiler/analysis/class_scope.h"
+#include "hphp/compiler/expression/parameter_expression.h"
 #include "hphp/compiler/expression/static_member_expression.h"
-#include "hphp/runtime/base/class_info.h"
+#include "hphp/runtime/base/class-info.h"
 #include "hphp/util/util.h"
-#include "hphp/util/parser/location.h"
-#include "hphp/util/parser/parser.h"
+#include "hphp/parser/location.h"
+#include "hphp/parser/parser.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,20 +69,31 @@ VariableTable::VariableTable(BlockScope &blockScope)
 
 void VariableTable::getLocalVariableNames(vector<string> &syms) const {
   FunctionScopeRawPtr fs = getScopePtr()->getContainingFunction();
-  bool dollarThisIsSpecial = (fs->getContainingClass() ||
-                              fs->inPseudoMain());
+  bool dollarThisIsSpecial = fs->getContainingClass() ||
+                             fs->inPseudoMain() ||
+                             // In closures, $this is "sometimes"
+                             // special (if it's a closure in a method
+                             // body), but it easiest to just always
+                             // treat it special.
+                             fs->isClosure();
 
+  bool hadThisSym = false;
   for (unsigned int i = 0; i < m_symbolVec.size(); i++) {
     const string& name = m_symbolVec[i]->getName();
     if (name == "this" && dollarThisIsSpecial) {
-      // The "this" variable in methods and pseudo-main is special and is
-      // handled separately below.
+      /*
+       * The "this" variable in methods, pseudo-main, or closures is
+       * special and is handled separately below.
+       *
+       * Closures are the specialest.
+       */
+      hadThisSym = true;
       continue;
     }
     syms.push_back(name);
   }
 
-  if (fs->needsLocalThis()) {
+  if (fs->needsLocalThis() || (hadThisSym && fs->isClosure())) {
     assert(dollarThisIsSpecial);
     // We only need a local variable named "this" if the current function
     // contains an occurrence of "$this" that is not part of a property
@@ -178,8 +190,6 @@ bool VariableTable::isLocal(const Symbol *sym) const {
     */
     return (!sym->isStatic() &&
             !sym->isGlobal() &&
-            !sym->isGeneratorParameter() &&
-            !sym->isRefGeneratorParameter() &&
             !sym->isParameter());
   }
   return false;
@@ -292,8 +302,7 @@ void VariableTable::addStaticVariable(Symbol *sym,
   m_hasStatic = true;
 
   FunctionScopeRawPtr funcScope = getFunctionScope();
-  if (funcScope &&
-      (funcScope->isClosure() || funcScope->isGeneratorFromClosure())) {
+  if (funcScope && funcScope->isClosure()) {
     // static variables for closures/closure generators are local to the
     // function scope
     m_staticLocalsVec.push_back(sym);
@@ -417,7 +426,14 @@ TypePtr VariableTable::add(Symbol *sym, TypePtr type,
   }
 
   type = setType(ar, sym, type, true);
-  sym->setDeclaration(construct);
+  if (sym->isParameter()) {
+    auto p = dynamic_pointer_cast<ParameterExpression>(construct);
+    if (p) {
+      sym->setDeclaration(construct);
+    }
+  } else {
+    sym->setDeclaration(construct);
+  }
 
   if (!implicit && m_blockScope.isFirstPass()) {
     if (!sym->getValue()) {
@@ -569,10 +585,6 @@ void VariableTable::clearUsed() {
     } else {
       sym.second.setReferenced();
     }
-
-    if (sym.second.isRefGeneratorParameter()) {
-      sym.second.setReferenced();
-    }
   }
 }
 

hphp/compiler/analysis/variable_table.h

@@ -20,6 +20,7 @@
 #include "hphp/compiler/analysis/symbol_table.h"
 #include "hphp/compiler/statement/statement.h"
 #include "hphp/compiler/analysis/class_scope.h"
+#include "hphp/util/hash-map-typedefs.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -296,7 +297,7 @@ public:
    * GlobalVariables class to make ThreadLocal<GlobalVaribles> work.
    * This data structure is only needed by global scope.
    */
-  DECLARE_BOOST_TYPES(StaticGlobalInfo);
+  DECLARE_EXTENDED_BOOST_TYPES(StaticGlobalInfo);
   struct StaticGlobalInfo {
     Symbol *sym;
     VariableTable *variables; // where this variable was from

hphp/compiler/builtin_symbols.cpp

@@ -27,12 +27,12 @@
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/analysis/constant_table.h"
-#include "hphp/util/parser/hphp.tab.hpp"
-#include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/base/program_functions.h"
-#include "hphp/runtime/base/array/array_iterator.h"
-#include "hphp/runtime/base/execution_context.h"
-#include "hphp/runtime/base/thread_init_fini.h"
+#include "hphp/parser/hphp.tab.hpp"
+#include "hphp/runtime/base/class-info.h"
+#include "hphp/runtime/base/program-functions.h"
+#include "hphp/runtime/base/array-iterator.h"
+#include "hphp/runtime/base/execution-context.h"
+#include "hphp/runtime/base/thread-init-fini.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/util.h"
 #include <dlfcn.h>
@@ -50,8 +50,7 @@ using namespace HPHP;
 
 bool BuiltinSymbols::Loaded = false;
 StringBag BuiltinSymbols::s_strings;
-
-StringToFunctionScopePtrMap BuiltinSymbols::s_functions;
+AnalysisResultPtr BuiltinSymbols::s_systemAr;
 
 const char *const BuiltinSymbols::GlobalNames[] = {
   "HTTP_RAW_POST_DATA",
@@ -86,12 +85,7 @@ const char *BuiltinSymbols::SystemClasses[] = {
   nullptr
 };
 
-StringToClassScopePtrMap BuiltinSymbols::s_classes;
-VariableTablePtr BuiltinSymbols::s_variables;
-ConstantTablePtr BuiltinSymbols::s_constants;
 StringToTypePtrMap BuiltinSymbols::s_superGlobals;
-AnalysisResultPtr BuiltinSymbols::s_systemAr;
-void *BuiltinSymbols::s_handle_main = nullptr;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -109,12 +103,20 @@ static TypePtr typePtrFromDataType(DataType dt, TypePtr unknown) {
     case KindOfString:  return Type::String;
     case KindOfArray:   return Type::Array;
     case KindOfObject:  return Type::Object;
+    case KindOfResource: return Type::Resource;
     case KindOfUnknown:
     default:
       return unknown;
   }
 }
 
+const StaticString
+  s_fb_call_user_func_safe("fb_call_user_func_safe"),
+  s_fb_call_user_func_safe_return("fb_call_user_func_safe_return"),
+  s_fb_call_user_func_array_safe("fb_call_user_func_array_safe"),
+  s_is_callable("is_callable"),
+  s_call_user_func_array("call_user_func_array");
+
 FunctionScopePtr BuiltinSymbols::ImportFunctionScopePtr(AnalysisResultPtr ar,
                  ClassInfo *cls, ClassInfo::MethodInfo *method) {
   int attrs = method->attribute;
@@ -155,19 +157,17 @@ FunctionScopePtr BuiltinSymbols::ImportFunctionScopePtr(AnalysisResultPtr ar,
   }
 
   f->setClassInfoAttribute(attrs);
-  if (attrs & ClassInfo::HasDocComment) {
-    f->setDocComment(method->docComment);
-  }
+  f->setDocComment(method->docComment);
 
   if (!isMethod && (attrs & ClassInfo::HasOptFunction)) {
     // Legacy optimization functions
-    if (method->name.same("fb_call_user_func_safe") ||
-        method->name.same("fb_call_user_func_safe_return") ||
-        method->name.same("fb_call_user_func_array_safe")) {
+    if (method->name.same(s_fb_call_user_func_safe) ||
+        method->name.same(s_fb_call_user_func_safe_return) ||
+        method->name.same(s_fb_call_user_func_array_safe)) {
       f->setOptFunction(hphp_opt_fb_call_user_func);
-    } else if (method->name.same("is_callable")) {
+    } else if (method->name.same(s_is_callable)) {
       f->setOptFunction(hphp_opt_is_callable);
-    } else if (method->name.same("call_user_func_array")) {
+    } else if (method->name.same(s_call_user_func_array)) {
       f->setOptFunction(hphp_opt_call_user_func);
     }
   }
@@ -212,19 +212,22 @@ FunctionScopePtr BuiltinSymbols::ImportFunctionScopePtr(AnalysisResultPtr ar,
 }
 
 void BuiltinSymbols::ImportExtFunctions(AnalysisResultPtr ar,
-                                        StringToFunctionScopePtrMap &map,
                                         ClassInfo *cls) {
   const ClassInfo::MethodVec &methods = cls->getMethodsVec();
   for (auto it = methods.begin(); it != methods.end(); ++it) {
+    if (((*it)->attribute & ClassInfo::ZendCompat) &&
+        !Option::EnableZendCompat) {
+      continue;
+    }
+
     FunctionScopePtr f = ImportFunctionScopePtr(ar, cls, *it);
-    assert(!map[f->getName()]);
-    map[f->getName()] = f;
+    ar->addSystemFunction(f);
   }
 }
 
-void BuiltinSymbols::ImportExtFunctions(AnalysisResultPtr ar,
-                                        FunctionScopePtrVec &vec,
-                                        ClassInfo *cls) {
+void BuiltinSymbols::ImportExtMethods(AnalysisResultPtr ar,
+                                      FunctionScopePtrVec &vec,
+                                      ClassInfo *cls) {
   const ClassInfo::MethodVec &methods = cls->getMethodsVec();
   for (auto it = methods.begin(); it != methods.end(); ++it) {
     FunctionScopePtr f = ImportFunctionScopePtr(ar, cls, *it);
@@ -263,7 +266,7 @@ void BuiltinSymbols::ImportExtConstants(AnalysisResultPtr ar,
   for (auto it = src.begin(); it != src.end(); ++it) {
     // We make an assumption that if the constant is a callback type
     // (e.g. STDIN, STDOUT, STDERR) then it will return an Object.
-    // And that if it's deferred (SID, PHP_SAPI) it'll be a String.
+    // And that if it's deferred (SID, PHP_SAPI, etc.) it'll be a String.
     ClassInfo::ConstantInfo *cinfo = *it;
     dest->add(cinfo->name.data(),
               cinfo->isDeferred() ?
@@ -276,7 +279,7 @@ void BuiltinSymbols::ImportExtConstants(AnalysisResultPtr ar,
 ClassScopePtr BuiltinSymbols::ImportClassScopePtr(AnalysisResultPtr ar,
                                                   ClassInfo *cls) {
   FunctionScopePtrVec methods;
-  ImportExtFunctions(ar, methods, cls);
+  ImportExtMethods(ar, methods, cls);
 
   ClassInfo::InterfaceVec ifaces = cls->getInterfacesVec();
   String parent = cls->getParentClass();
@@ -298,9 +301,7 @@ ClassScopePtr BuiltinSymbols::ImportClassScopePtr(AnalysisResultPtr ar,
   ImportExtConstants(ar, cl->getConstants(), cls);
   int attrs = cls->getAttribute();
   cl->setClassInfoAttribute(attrs);
-  if (attrs & ClassInfo::HasDocComment) {
-    cl->setDocComment(cls->getDocComment());
-  }
+  cl->setDocComment(cls->getDocComment());
   cl->setSystem();
   return cl;
 }
@@ -308,9 +309,15 @@ ClassScopePtr BuiltinSymbols::ImportClassScopePtr(AnalysisResultPtr ar,
 void BuiltinSymbols::ImportExtClasses(AnalysisResultPtr ar) {
   const ClassInfo::ClassMap &classes = ClassInfo::GetClassesMap();
   for (auto it = classes.begin(); it != classes.end(); ++it) {
+
+    const ClassInfo *info = it->second;
+    if ((info->getAttribute() & ClassInfo::ZendCompat) &&
+        !Option::EnableZendCompat) {
+      continue;
+    }
+
     ClassScopePtr cl = ImportClassScopePtr(ar, it->second);
-    assert(!s_classes[cl->getName()]);
-    s_classes[cl->getName()] = cl;
+    ar->addSystemClass(cl);
   }
 }
 
@@ -322,13 +329,11 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) {
   ClassInfo::Load();
 
   // load extension functions first, so system/php may call them
-  ImportExtFunctions(ar, s_functions, ClassInfo::GetSystem());
-  AnalysisResultPtr ar2 = AnalysisResultPtr(new AnalysisResult());
-  s_variables = VariableTablePtr(new VariableTable(*ar2.get()));
-  s_constants = ConstantTablePtr(new ConstantTable(*ar2.get()));
+  ImportExtFunctions(ar, ClassInfo::GetSystem());
 
+  ConstantTablePtr cns = ar->getConstants();
   // load extension constants, classes and dynamics
-  ImportExtConstants(ar, s_constants, ClassInfo::GetSystem());
+  ImportExtConstants(ar, cns, ClassInfo::GetSystem());
   ImportExtClasses(ar);
 
   Array constants = ClassInfo::GetSystemConstants();
@@ -337,11 +342,11 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) {
     CVarRef key = it.first();
     if (!key.isString()) continue;
     std::string name = key.toCStrRef().data();
-    if (s_constants->getSymbol(name)) continue;
+    if (cns->getSymbol(name)) continue;
     if (name == "true" || name == "false" || name == "null") continue;
     CVarRef value = it.secondRef();
     if (!value.isInitialized() || value.isObject()) continue;
-    ExpressionPtr e = Expression::MakeScalarExpression(ar2, ar2, loc, value);
+    ExpressionPtr e = Expression::MakeScalarExpression(ar, ar, loc, value);
     TypePtr t =
       value.isNull()    ? Type::Null    :
       value.isBoolean() ? Type::Boolean :
@@ -349,119 +354,47 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) {
       value.isDouble()  ? Type::Double  :
       value.isArray()   ? Type::Array   : Type::Variant;
 
-    s_constants->add(key.toCStrRef().data(), t, e, ar2, e);
+    cns->add(key.toCStrRef().data(), t, e, ar, e);
   }
-  s_variables = ar2->getVariables();
   for (int i = 0, n = NumGlobalNames(); i < n; ++i) {
-    s_variables->add(GlobalNames[i], Type::Variant, false, ar,
-                     ConstructPtr(), ModifierExpressionPtr());
+    ar->getVariables()->add(GlobalNames[i], Type::Variant, false, ar,
+                            ConstructPtr(), ModifierExpressionPtr());
   }
 
-  s_constants->setDynamic(ar, "SID", true);
-  s_constants->setDynamic(ar, "PHP_SAPI", true);
+  cns->setDynamic(ar, "PHP_BINARY", true);
+  cns->setDynamic(ar, "PHP_BINDIR", true);
+  cns->setDynamic(ar, "PHP_OS", true);
+  cns->setDynamic(ar, "PHP_SAPI", true);
+  cns->setDynamic(ar, "SID", true);
 
-  // parse all PHP files under system/php
-  s_systemAr = ar = AnalysisResultPtr(new AnalysisResult());
-  ar->loadBuiltins();
-  string slib = get_systemlib();
+  // Systemlib files were all parsed by hphp_process_init
 
-  Scanner scanner(slib.c_str(), slib.size(),
-                  Option::GetScannerType(), "systemlib.php");
-  Compiler::Parser parser(scanner, "systemlib.php", ar);
-  if (!parser.parse()) {
-    Logger::Error("Unable to parse systemlib.php: %s",
-                  parser.getMessage().c_str());
-    assert(false);
-  }
-
-  ar->analyzeProgram(true);
-  ar->inferTypes();
   const StringToFileScopePtrMap &files = ar->getAllFiles();
-  for (StringToFileScopePtrMap::const_iterator iterFile = files.begin();
-       iterFile != files.end(); iterFile++) {
-    const StringToClassScopePtrVecMap &classes =
-      iterFile->second->getClasses();
-    for (StringToClassScopePtrVecMap::const_iterator iter = classes.begin();
-         iter != classes.end(); ++iter) {
-      assert(iter->second.size() == 1);
-      iter->second[0]->setSystem();
-      assert(!s_classes[iter->first]);
-      s_classes[iter->first] = iter->second[0];
+  for (const auto& file : files) {
+    file.second->setSystem();
+
+    const auto& classes = file.second->getClasses();
+    for (const auto& clsVec : classes) {
+      assert(clsVec.second.size() == 1);
+      auto cls = clsVec.second[0];
+      cls->setSystem();
+      ar->addSystemClass(cls);
+      for (const auto& func : cls->getFunctions()) {
+        FunctionScope::RecordFunctionInfo(func.first, func.second);
+      }
     }
 
-    const StringToFunctionScopePtrMap &functions =
-      iterFile->second->getFunctions();
-    for (StringToFunctionScopePtrMap::const_iterator iter = functions.begin();
-         iter != functions.end(); ++iter) {
-      iter->second->setSystem();
-      s_functions[iter->first] = iter->second;
+    const auto& functions = file.second->getFunctions();
+    for (const auto& func : functions) {
+      func.second->setSystem();
+      ar->addSystemFunction(func.second);
+      FunctionScope::RecordFunctionInfo(func.first, func.second);
     }
   }
 
   return true;
 }
 
-AnalysisResultPtr BuiltinSymbols::LoadGlobalSymbols(const char *fileName) {
-  AnalysisResultPtr ar(new AnalysisResult());
-  string phpBaseName = "/system/globals/";
-  phpBaseName += fileName;
-  string phpFileName = Option::GetSystemRoot() + phpBaseName;
-  const char *baseName = s_strings.add(phpBaseName.c_str());
-  fileName = s_strings.add(phpFileName.c_str());
-
-  try {
-    Scanner scanner(fileName, Option::GetScannerType());
-    Compiler::Parser parser(scanner, baseName, ar);
-    if (!parser.parse()) {
-      assert(false);
-      Logger::Error("Unable to parse file %s: %s", fileName,
-                    parser.getMessage().c_str());
-    }
-  } catch (FileOpenException &e) {
-    Logger::Error("%s", e.getMessage().c_str());
-  }
-  ar->analyzeProgram(true);
-  ar->inferTypes();
-  return ar;
-}
-
-void BuiltinSymbols::LoadFunctions(AnalysisResultPtr ar,
-                                   StringToFunctionScopePtrMap &functions) {
-  assert(Loaded);
-  functions.insert(s_functions.begin(), s_functions.end());
-}
-
-void BuiltinSymbols::LoadClasses(AnalysisResultPtr ar,
-                                 StringToClassScopePtrMap &classes) {
-  assert(Loaded);
-  classes.insert(s_classes.begin(), s_classes.end());
-}
-
-void BuiltinSymbols::LoadVariables(AnalysisResultPtr ar,
-                                   VariableTablePtr variables) {
-  assert(Loaded);
-  if (s_variables) {
-    variables->import(s_variables);
-  }
-}
-
-void BuiltinSymbols::LoadConstants(AnalysisResultPtr ar,
-                                   ConstantTablePtr constants) {
-  assert(Loaded);
-  if (s_constants) {
-    constants->import(s_constants);
-  }
-}
-
-ConstantTablePtr BuiltinSymbols::LoadSystemConstants() {
-  AnalysisResultPtr ar = LoadGlobalSymbols("constants.php");
-  const auto &fileScopes = ar->getAllFilesVector();
-  if (!fileScopes.empty()) {
-    return fileScopes[0]->getConstants();
-  }
-  throw std::runtime_error("LoadSystemConstants failed");
-}
-
 void BuiltinSymbols::LoadSuperGlobals() {
   if (s_superGlobals.empty()) {
     s_superGlobals["_SERVER"] = Type::Variant;

hphp/compiler/builtin_symbols.h

@@ -18,22 +18,23 @@
 #define incl_HPHP_BUILTIN_SYMBOLS_H_
 
 #include "hphp/compiler/hphp.h"
-#include "hphp/util/string_bag.h"
-#include "hphp/runtime/base/class_info.h"
+#include "hphp/util/string-bag.h"
+#include "hphp/runtime/base/class-info.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-DECLARE_BOOST_TYPES(Type);
+DECLARE_EXTENDED_BOOST_TYPES(Type);
 DECLARE_BOOST_TYPES(AnalysisResult);
-DECLARE_BOOST_TYPES(FunctionScope);
-DECLARE_BOOST_TYPES(ClassScope);
+DECLARE_EXTENDED_BOOST_TYPES(FunctionScope);
+DECLARE_EXTENDED_BOOST_TYPES(ClassScope);
 DECLARE_BOOST_TYPES(VariableTable);
 DECLARE_BOOST_TYPES(ConstantTable);
 
 class BuiltinSymbols {
 public:
   static bool Loaded;
+  static AnalysisResultPtr s_systemAr;
 
   static bool Load(AnalysisResultPtr ar);
 
@@ -46,11 +47,6 @@ public:
   static void LoadConstants(AnalysisResultPtr ar,
                             ConstantTablePtr constants);
 
-  /*
-   * Load system/globals/constants.php.
-   */
-  static ConstantTablePtr LoadSystemConstants();
-
   /**
    * Testing whether a variable is a PHP superglobal.
    */
@@ -60,35 +56,24 @@ public:
   static bool IsDeclaredDynamic(const std::string& name);
   static void LoadSuperGlobals();
 
-  static StringToFunctionScopePtrMap s_functions;
-  static StringToClassScopePtrMap s_classes;
-  static VariableTablePtr s_variables;
-  static ConstantTablePtr s_constants;
-  static AnalysisResultPtr s_systemAr;
-
   static const char *const GlobalNames[];
   static int NumGlobalNames();
 private:
   static StringBag s_strings;
   static const char *SystemClasses[];
 
-  static AnalysisResultPtr LoadGlobalSymbols(const char *fileName);
-
   static StringToTypePtrMap s_superGlobals;
 
   static std::set<std::string> s_declaredDynamic;
 
-  static void *s_handle_main;
-
   static FunctionScopePtr ImportFunctionScopePtr(AnalysisResultPtr ar,
                                                  ClassInfo *cls,
                                                  ClassInfo::MethodInfo *method);
   static void ImportExtFunctions(AnalysisResultPtr ar,
-                                 StringToFunctionScopePtrMap &map,
-                                 ClassInfo *cls);
-  static void ImportExtFunctions(AnalysisResultPtr ar,
-                                 FunctionScopePtrVec &vec,
                                  ClassInfo *cls);
+  static void ImportExtMethods(AnalysisResultPtr ar,
+                               FunctionScopePtrVec &vec,
+                               ClassInfo *cls);
   static void ImportExtProperties(AnalysisResultPtr ar,
                                   VariableTablePtr dest,
                                   ClassInfo *cls);

hphp/compiler/code_generator.cpp

@@ -14,15 +14,16 @@
    +----------------------------------------------------------------------+
 */
 
-#include <stdarg.h>
-
 #include "hphp/compiler/code_generator.h"
+#include "hphp/compiler/code_model_enums.h"
 #include "hphp/compiler/statement/statement_list.h"
+#include "hphp/compiler/expression/expression_list.h"
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/analysis/function_scope.h"
 #include "hphp/compiler/analysis/analysis_result.h"
 #include "hphp/compiler/analysis/variable_table.h"
+#include "hphp/runtime/base/zend-printf.h"
 #include "hphp/util/util.h"
 #include "hphp/util/hash.h"
 #include <boost/format.hpp>
@@ -424,3 +425,171 @@ int CodeGenerator::ClassScopeCompare::cmp(const ClassScopeRawPtr &p1,
   if (d) return d;
   return strcasecmp(p1->getName().c_str(), p2->getName().c_str());
 }
+
+void CodeGenerator::printObjectHeader(const std::string className,
+                                      int numProperties) {
+  std::string prefixedClassName;
+  prefixedClassName.append(m_astPrefix);
+  prefixedClassName.append(className);
+  m_astClassNames.push_back(prefixedClassName);
+  printf("O:%d:\"%s\":%d:{",
+    (int)prefixedClassName.length(), prefixedClassName.c_str(), numProperties);
+}
+
+void CodeGenerator::printObjectFooter() {
+  printf("}");
+  m_astClassNames.pop_back();
+}
+
+void CodeGenerator::printPropertyHeader(const std::string propertyName) {
+  auto prefixedClassName = m_astClassNames.back();
+  auto len = 2+prefixedClassName.length()+propertyName.length();
+  printf("s:%d:\"", (int)len);
+  *m_out << (char)0;
+  printf("%s", prefixedClassName.c_str());
+  *m_out << (char)0;
+  printf("%s\";", propertyName.c_str());
+}
+
+void CodeGenerator::printNull() {
+  printf("N;");
+}
+
+void CodeGenerator::printBool(bool value) {
+  printf("b:%d;", value ? 1 : 0);
+}
+
+void CodeGenerator::printValue(double v) {
+  *m_out << "d:";
+  if (std::isnan(v)) {
+    *m_out << "NAN";
+  } else if (std::isinf(v)) {
+    if (v < 0) *m_out << '-';
+    *m_out << "INF";
+  } else {
+    char *buf;
+    if (v == 0.0) v = 0.0; // so to avoid "-0" output
+    vspprintf(&buf, 0, "%.*H", 14, v);
+    m_out->write(buf, strlen(buf));
+    free(buf);
+  }
+  *m_out << ';';
+}
+
+void CodeGenerator::printValue(int32_t value) {
+  printf("i:%d;", value);
+}
+
+void CodeGenerator::printValue(int64_t value) {
+  printf("i:%" PRId64 ";", value);
+}
+
+void CodeGenerator::printValue(std::string value) {
+  printf("s:%d:\"", (int)value.length());
+  getStream()->write(value.c_str(), value.length());
+  printf("\";");
+}
+
+void CodeGenerator::printModifierVector(std::string value) {
+  printf("V:9:\"HH\\Vector\":1:{");
+  printObjectHeader("Modifier", 1);
+  printPropertyHeader("name");
+  printValue(value);
+  printObjectFooter();
+  printf("}");
+}
+
+void CodeGenerator::printTypeExpression(std::string value) {
+  printObjectHeader("TypeExpression", 1);
+  printPropertyHeader("name");
+  printValue(value);
+  printObjectFooter();
+}
+
+void CodeGenerator::printExpression(ExpressionPtr expression, bool isRef) {
+  if (isRef) {
+    printObjectHeader("UnaryOpExpression", 3);
+    printPropertyHeader("expression");
+    expression->outputCodeModel(*this);
+    printPropertyHeader("operation");
+    printValue(PHP_REFERENCE_OP);
+    printPropertyHeader("sourceLocation");
+    printLocation(expression->getLocation());
+    printObjectFooter();
+  } else {
+    expression->outputCodeModel(*this);
+  }
+}
+
+void CodeGenerator::printExpressionVector(ExpressionListPtr el) {
+  auto count = el == nullptr ? 0 : el->getCount();
+  printf("V:9:\"HH\\Vector\":%d:{", count);
+  if (count > 0) {
+    el->outputCodeModel(*this);
+  }
+  printf("}");
+}
+
+void CodeGenerator::printExpressionVector(ExpressionPtr e) {
+  if (e->is(Expression::KindOfExpressionList)) {
+    auto sl = static_pointer_cast<ExpressionList>(e);
+    printExpressionVector(sl);
+  } else {
+    printf("V:9:\"HH\\Vector\":1:{");
+    e->outputCodeModel(*this);
+    printf("}");
+  }
+}
+
+void CodeGenerator::printAsBlock(StatementPtr s) {
+  if (s != nullptr && s->is(Statement::KindOfBlockStatement)) {
+    s->outputCodeModel(*this);
+  } else {
+    auto numProps = s == nullptr ? 1 : 2;
+    printObjectHeader("BlockStatement", numProps);
+    printPropertyHeader("statements");
+    printStatementVector(s);
+    if (s != nullptr) {
+      printPropertyHeader("sourceLocation");
+      printLocation(s->getLocation());
+    }
+    printObjectFooter();
+  }
+}
+
+void CodeGenerator::printStatementVector(StatementListPtr sl) {
+  printf("V:9:\"HH\\Vector\":%d:{", sl->getCount());
+  if (sl->getCount() > 0) {
+    sl->outputCodeModel(*this);
+  }
+  printf("}");
+}
+
+void CodeGenerator::printStatementVector(StatementPtr s) {
+  if (s == nullptr) {
+    printf("V:9:\"HH\\Vector\":0:{}");
+  } else if (s->is(Statement::KindOfStatementList)) {
+    auto sl = static_pointer_cast<StatementList>(s);
+    printStatementVector(sl);
+  } else {
+    printf("V:9:\"HH\\Vector\":1:{");
+    s->outputCodeModel(*this);
+    printf("}");
+  }
+}
+
+void CodeGenerator::printLocation(LocationPtr location) {
+  if (location == nullptr) return;
+  printObjectHeader("SourceLocation", 4);
+  printPropertyHeader("startLine");
+  printValue(location->line0);
+  printPropertyHeader("endLine");
+  printValue(location->line1);
+  printPropertyHeader("startColumn");
+  printValue(location->char0);
+  printPropertyHeader("endColumn");
+  printValue(location->char1);
+  printObjectFooter();
+}
+
+

hphp/compiler/code_generator.h

@@ -24,12 +24,16 @@ namespace HPHP {
 
 DECLARE_BOOST_TYPES(AnalysisResult);
 DECLARE_BOOST_TYPES(Statement);
+DECLARE_BOOST_TYPES(StatementList);
 DECLARE_BOOST_TYPES(Construct);
 DECLARE_BOOST_TYPES(BlockScope);
-DECLARE_BOOST_TYPES(ClassScope);
+DECLARE_EXTENDED_BOOST_TYPES(ClassScope);
 DECLARE_BOOST_TYPES(FunctionScope);
 DECLARE_BOOST_TYPES(FileScope);
 DECLARE_BOOST_TYPES(LoopStatement);
+DECLARE_BOOST_TYPES(Location);
+DECLARE_BOOST_TYPES(Expression);
+DECLARE_BOOST_TYPES(ExpressionList);
 
 class CodeGenerator {
 public:
@@ -45,6 +49,7 @@ public:
     SystemCPP,  // special mode for generating builtin classes
     TextHHBC,   // HHBC dump in human-readable format
     BinaryHHBC, // serialized HHBC
+    CodeModel,  // serialized Code Model classes
   };
 
   enum Stream {
@@ -265,12 +270,37 @@ public:
   FileScopeRawPtr getLiteralScope() const {
     return m_literalScope;
   }
+
+  /**
+   * Support for printing AST nodes in PHP serialize() format.
+   */
+  void printObjectHeader(const std::string className, int numProperties);
+  void printPropertyHeader(const std::string propertyName);
+  void printObjectFooter();
+  void printNull();
+  void printBool(bool value);
+  void printValue(double value);
+  void printValue(int32_t value);
+  void printValue(int64_t value);
+  void printValue(std::string value);
+  void printModifierVector(std::string value);
+  void printTypeExpression(std::string value);
+  void printExpression(ExpressionPtr expression, bool isRef);
+  void printExpressionVector(ExpressionListPtr el);
+  void printExpressionVector(ExpressionPtr e);
+  void printAsBlock(StatementPtr s);
+  void printStatementVector(StatementListPtr sl);
+  void printStatementVector(StatementPtr s);
+  void printLocation(LocationPtr location);
+  void setAstClassPrefix(const std::string &prefix) { m_astPrefix = prefix; }
 private:
   std::string m_filename;
   Stream m_curStream;
   std::ostream *m_streams[StreamCount];
   std::ostream *m_out;
   Output m_output;
+  std::string m_astPrefix;
+  std::vector<std::string> m_astClassNames;
   bool m_verbose;
 
   int m_indentation[StreamCount];

hphp/compiler/code_model_enums.h

@@ -0,0 +1,117 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+// This file is @generated by tools/code-model/GenerateEnums.sh
+
+#ifndef incl_HPHP_CODE_MODEL_ENUMS_H_
+#define incl_HPHP_CODE_MODEL_ENUMS_H_
+
+namespace HPHP {
+  /** The kinds of operations that IBinaryOpExpressions can perform. */
+  enum CodeModelBinaryOperator {
+    PHP_AND_ASSIGN = 1,
+    PHP_AND = 2,
+    PHP_ARRAY_ELEMENT = 3,
+    PHP_ARRAY_PAIR = 4,
+    PHP_ASSIGNMENT = 5,
+    PHP_BOOLEAN_AND = 6,
+    PHP_BOOLEAN_OR = 7,
+    PHP_CAST = 8,
+    PHP_CONCAT_ASSIGN = 9,
+    PHP_CONCAT = 10,
+    PHP_DIVIDE_ASSIGN = 11,
+    PHP_DIVIDE = 12,
+    PHP_INSTANCEOF = 13,
+    PHP_IS_EQUAL = 14,
+    PHP_IS_GREATER = 15,
+    PHP_IS_GREATER_OR_EQUAL = 16,
+    PHP_IS_IDENTICAL = 17,
+    PHP_IS_NOT_IDENTICAL = 18,
+    PHP_IS_NOT_EQUAL = 19,
+    PHP_IS_SMALLER = 20,
+    PHP_IS_SMALLER_OR_EQUAL = 21,
+    PHP_LOGICAL_AND = 22,
+    PHP_LOGICAL_OR = 23,
+    PHP_LOGICAL_XOR = 24,
+    PHP_MINUS_ASSIGN = 25,
+    PHP_MINUS = 26,
+    PHP_MODULUS_ASSIGN = 27,
+    PHP_MODULUS = 28,
+    PHP_MULTIPLY_ASSIGN = 29,
+    PHP_MULTIPLY = 30,
+    PHP_OR_ASSIGN = 31,
+    PHP_OR = 32,
+    PHP_PLUS_ASSIGN = 33,
+    PHP_PLUS = 34,
+    PHP_SHIFT_LEFT_ASSIGN = 35,
+    PHP_SHIFT_LEFT = 36,
+    PHP_SHIFT_RIGHT_ASSIGN = 37,
+    PHP_SHIFT_RIGHT = 38,
+    PHP_XOR_ASSIGN = 39,
+    PHP_XOR = 40,
+  };
+
+  /** The kinds of operations that IUnaryOpExpressions can perform. */
+  enum CodeModelUnaryOperator {
+    PHP_ARRAY_CAST_OP = 1,
+    PHP_ARRAY_APPEND_POINT_OP = 2,
+    PHP_AWAIT_OP = 3,
+    PHP_BOOL_CAST_OP = 4,
+    PHP_BITWISE_NOT_OP = 5,
+    PHP_CLONE_OP = 6,
+    PHP_DYNAMIC_VARIABLE_OP = 7,
+    PHP_ERROR_CONTROL_OP = 8,
+    PHP_FLOAT_CAST_OP = 9,
+    PHP_INCLUDE_OP = 10,
+    PHP_INCLUDE_ONCE_OP = 11,
+    PHP_INT_CAST_OP = 12,
+    PHP_MINUS_OP = 13,
+    PHP_NOT_OP = 14,
+    PHP_OBJECT_CAST_OP = 15,
+    PHP_PLUS_OP = 16,
+    PHP_POST_DECREMENT_OP = 17,
+    PHP_POST_INCREMENT_OP = 18,
+    PHP_PRE_DECREMENT_OP = 19,
+    PHP_PRE_INCREMENT_OP = 20,
+    PHP_PRINT_OP = 21,
+    PHP_REFERENCE_OP = 22,
+    PHP_REQUIRE_OP = 23,
+    PHP_REQUIRE_ONCE_OP = 24,
+    PHP_STRING_CAST_OP = 25,
+    PHP_UNSET_CAST_OP = 26,
+  };
+
+  /** Enumerates the kinds of trait require statements. */
+  enum CodeModelRequireKind {
+    PHP_EXTENDS = 1,
+    PHP_IMPLEMENTS = 2,
+  };
+
+  /** Enumerates the kinds of type declaration statements. */
+  enum CodeModelTypeKind {
+    PHP_CLASS = 1,
+    PHP_INTERFACE = 2,
+    PHP_TRAIT = 3,
+  };
+
+  /** The sort order to use when grouping query results */
+  enum CodeModelOrder {
+    PHP_NOT_SPECIFIED = 1,
+    PHP_ASCENDING = 2,
+    PHP_DESCENDING = 3,
+  };
+
+}
+#endif // incl_HPHP_CODE_MODEL_ENUMS_H_

hphp/compiler/compiler.cpp

@@ -25,24 +25,24 @@
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/parser/parser.h"
 #include "hphp/compiler/builtin_symbols.h"
-#include "hphp/util/json.h"
+#include "hphp/compiler/json.h"
 #include "hphp/util/logger.h"
-#include "hphp/util/db_conn.h"
+#include "hphp/util/db-conn.h"
 #include "hphp/util/exception.h"
 #include "hphp/util/process.h"
 #include "hphp/util/util.h"
 #include "hphp/util/timer.h"
 #include "hphp/util/hdf.h"
-#include "hphp/util/async_func.h"
-#include "hphp/runtime/base/program_functions.h"
-#include "hphp/runtime/base/memory/smart_allocator.h"
+#include "hphp/util/async-func.h"
+#include "hphp/util/current-executable.h"
+#include "hphp/runtime/base/program-functions.h"
 #include "hphp/runtime/base/externals.h"
-#include "hphp/runtime/base/thread_init_fini.h"
+#include "hphp/runtime/base/thread-init-fini.h"
 #include "hphp/runtime/vm/repo.h"
 #include "hphp/system/systemlib.h"
-#include "hphp/util/repo_schema.h"
+#include "hphp/util/repo-schema.h"
 
-#include "hphp/hhvm/process_init.h"
+#include "hphp/hhvm/process-init.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -344,8 +344,8 @@ int prepareOptions(CompilerOptions &po, int argc, char **argv) {
     return 1;
   }
   if (vm.count("version")) {
-#ifdef HPHP_VERSION
-#undef HPHP_VERSION
+#ifdef HHVM_VERSION
+#undef HHVM_VERSION
 #endif
 
 #ifdef HPHP_COMPILER_STR
@@ -358,8 +358,8 @@ int prepareOptions(CompilerOptions &po, int argc, char **argv) {
 #define HPHP_COMPILER_STR "HipHop Compiler v"
 #endif
 
-#define HPHP_VERSION(v) cout << HPHP_COMPILER_STR #v << "\n";
-#include "../version"
+#define HHVM_VERSION(v) cout << HPHP_COMPILER_STR #v << "\n";
+#include "../version" // nolint
 
     cout << "Compiler: " << kCompilerId << "\n";
     cout << "Repo schema: " << kRepoSchemaId << "\n";
@@ -484,6 +484,8 @@ int prepareOptions(CompilerOptions &po, int argc, char **argv) {
     Option::ParseTimeOpts = false;
   }
 
+  initialize_hhbbc_options();
+
   return 0;
 }
 
@@ -540,6 +542,12 @@ int process(const CompilerOptions &po) {
 
   bool isPickledPHP = (po.target == "php" && po.format == "pickled");
   if (!isPickledPHP) {
+    bool wp = Option::WholeProgram;
+    Option::WholeProgram = false;
+    BuiltinSymbols::s_systemAr = ar;
+    hphp_process_init();
+    BuiltinSymbols::s_systemAr.reset();
+    Option::WholeProgram = wp;
     if (po.target == "hhbc" && !Option::WholeProgram) {
       // We're trying to produce the same bytecode as runtime parsing.
       // There's nothing to do.
@@ -547,9 +555,7 @@ int process(const CompilerOptions &po) {
       if (!BuiltinSymbols::Load(ar)) {
         return false;
       }
-      ar->loadBuiltins();
     }
-    hphp_process_init();
   }
 
   {
@@ -596,6 +602,7 @@ int process(const CompilerOptions &po) {
         return 1;
       }
       if (Option::WholeProgram || po.target == "analyze") {
+        Timer timer(Timer::WallTime, "analyzeProgram");
         ar->analyzeProgram();
       }
     }
@@ -800,10 +807,12 @@ void hhbcTargetInit(const CompilerOptions &po, AnalysisResultPtr ar) {
   if (po.format.find("exe") != string::npos) {
     RuntimeOption::RepoCentralPath += ".hhbc";
   }
+  unlink(RuntimeOption::RepoCentralPath.c_str());
   RuntimeOption::RepoLocalMode = "--";
   RuntimeOption::RepoDebugInfo = Option::RepoDebugInfo;
   RuntimeOption::RepoJournal = "memory";
   RuntimeOption::EnableHipHopSyntax = Option::EnableHipHopSyntax;
+  RuntimeOption::EnableZendCompat = Option::EnableZendCompat;
   RuntimeOption::EvalJitEnableRenameFunction = Option::JitEnableRenameFunction;
 
   // Turn off commits, because we don't want systemlib to get included
@@ -866,11 +875,11 @@ int hhbcTarget(const CompilerOptions &po, AnalysisResultPtr ar,
      */
     string exe = po.outputDir + '/' + po.program;
     string repo = "repo=" + exe + ".hhbc";
-    char buf[PATH_MAX];
-    if (!realpath("/proc/self/exe", buf)) return -1;
+    string buf = current_executable_path();
+    if (buf.empty()) return -1;
 
     const char *argv[] = { "objcopy", "--add-section", repo.c_str(),
-                           buf, exe.c_str(), 0 };
+                           buf.c_str(), exe.c_str(), 0 };
     string out;
     ret = Process::Exec(argv[0], argv, nullptr, out, nullptr) ? 0 : 1;
   }
@@ -909,11 +918,13 @@ int runTarget(const CompilerOptions &po) {
   // run the executable
   string cmd;
   if (po.format.find("exe") == string::npos) {
-    char buf[PATH_MAX];
-    if (!realpath("/proc/self/exe", buf)) return -1;
+    string buf = current_executable_path();
+    if (buf.empty()) return -1;
 
     cmd += buf;
     cmd += " -vRepo.Authoritative=true";
+    if (getenv("HPHP_DUMP_BYTECODE")) cmd += " -vEval.DumpBytecode=1";
+    if (getenv("HPHP_INTERP"))        cmd += " -vEval.Jit=0";
     cmd += " -vRepo.Local.Mode=r- -vRepo.Local.Path=";
   }
   cmd += po.outputDir + '/' + po.program;

hphp/compiler/construct.cpp

@@ -44,7 +44,7 @@ void Construct::resetScope(BlockScopeRawPtr scope, bool resetOrigScope) {
   setBlockScope(scope);
   if (resetOrigScope) {
     ExpressionPtr expr =
-      boost::dynamic_pointer_cast<Expression>(shared_from_this());
+      dynamic_pointer_cast<Expression>(shared_from_this());
     if (expr) {
       expr->setOriginalScope(scope);
     }
@@ -439,7 +439,7 @@ public:
     // HACK: dump the closure function as a "child" of the
     // closure expression
     ClosureExpressionPtr c =
-      boost::dynamic_pointer_cast<ClosureExpression>(cp);
+      dynamic_pointer_cast<ClosureExpression>(cp);
     if (c) {
       c->getClosureFunction()->dump(m_spc, m_ar);
     }
@@ -469,9 +469,23 @@ void Construct::parseTimeFatal(Compiler::ErrorType err, const char *fmt, ...) {
   va_list ap;
   va_start(ap, fmt);
   string msg;
-  Util::string_vsnprintf(msg, fmt, ap);
+  string_vsnprintf(msg, fmt, ap);
   va_end(ap);
 
   if (err != Compiler::NoError) Compiler::Error(err, shared_from_this());
   throw ParseTimeFatalException(m_loc->file, m_loc->line0, "%s", msg.c_str());
 }
+
+void Construct::analysisTimeFatal(Compiler::ErrorType err,
+                                  const char *fmt, ...) {
+  va_list ap;
+  va_start(ap, fmt);
+  string msg;
+  string_vsnprintf(msg, fmt, ap);
+  va_end(ap);
+
+  assert(err != Compiler::NoError);
+  Compiler::Error(err, shared_from_this());
+  throw AnalysisTimeFatalException(m_loc->file, m_loc->line0,
+                                   "%s [analysis]", msg.c_str());
+}

hphp/compiler/construct.h

@@ -17,7 +17,7 @@
 #ifndef incl_HPHP_CONSTRUCT_H_
 #define incl_HPHP_CONSTRUCT_H_
 
-#include "hphp/util/json.h"
+#include "hphp/compiler/json.h"
 #include "hphp/compiler/code_generator.h"
 #include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/block_scope.h"
@@ -67,7 +67,7 @@ public:
 /**
  * Base class of Expression and Statement.
  */
-class Construct : public boost::enable_shared_from_this<Construct>,
+class Construct : public std::enable_shared_from_this<Construct>,
                   public JSON::CodeError::ISerializable {
 protected:
   Construct(BlockScopePtr scope, LocationPtr loc);
@@ -180,6 +180,8 @@ public:
   void resetScope(BlockScopeRawPtr scope, bool resetOrigScope=false);
   void parseTimeFatal(Compiler::ErrorType error, const char *fmt, ...)
     ATTRIBUTE_PRINTF(3,4);
+  void analysisTimeFatal(Compiler::ErrorType error, const char *fmt, ...)
+    ATTRIBUTE_PRINTF(3,4);
   virtual int getLocalEffects() const { return UnknownEffect;}
   int getChildrenEffects() const;
   int getContainedEffects() const;
@@ -187,15 +189,16 @@ public:
   virtual bool kidUnused(int i) const { return false; }
 
   template<typename T>
-  static boost::shared_ptr<T> Clone(boost::shared_ptr<T> constr) {
+  static std::shared_ptr<T> Clone(std::shared_ptr<T> constr) {
     if (constr) {
-      return boost::dynamic_pointer_cast<T>(constr->clone());
+      return dynamic_pointer_cast<T>(constr->clone());
     }
-    return boost::shared_ptr<T>();
+    return std::shared_ptr<T>();
   }
 
   template<typename T>
-  boost::shared_ptr<T> Clone(boost::shared_ptr<T> constr, BlockScopePtr scope) {
+  std::shared_ptr<T> Clone(std::shared_ptr<T> constr,
+                           BlockScopePtr scope) {
     if (constr) {
       constr = constr->clone();
       constr->resetScope(scope);
@@ -243,6 +246,11 @@ public:
                    const AstWalkerStateVec &start,
                    ConstructPtr endBefore, ConstructPtr endAfter);
 
+  /**
+   * Generates a serialized Code Model corresponding to this AST.
+   */
+  virtual void outputCodeModel(CodeGenerator &cg) = 0;
+
   /**
    * Called when generating code.
    */

hphp/compiler/expression/array_element_expression.cpp

@@ -19,12 +19,13 @@
 #include "hphp/compiler/expression/scalar_expression.h"
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/analysis/code_error.h"
+#include "hphp/compiler/code_model_enums.h"
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/expression/static_member_expression.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include "hphp/util/parser/hphp.tab.hpp"
-#include "hphp/runtime/base/complex_types.h"
-#include "hphp/runtime/base/builtin_functions.h"
+#include "hphp/parser/hphp.tab.hpp"
+#include "hphp/runtime/base/complex-types.h"
+#include "hphp/runtime/base/builtin-functions.h"
 
 using namespace HPHP;
 
@@ -217,10 +218,10 @@ int ArrayElementExpression::getKidCount() const {
 void ArrayElementExpression::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_variable = boost::dynamic_pointer_cast<Expression>(cp);
+      m_variable = dynamic_pointer_cast<Expression>(cp);
       break;
     case 1:
-      m_offset = boost::dynamic_pointer_cast<Expression>(cp);
+      m_offset = dynamic_pointer_cast<Expression>(cp);
       break;
     default:
       assert(false);
@@ -388,6 +389,42 @@ ExpressionPtr ArrayElementExpression::unneeded() {
   return Expression::unneeded();
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void ArrayElementExpression::outputCodeModel(CodeGenerator &cg) {
+  if (Option::ConvertSuperGlobals && m_global && !m_dynamicGlobal &&
+      getScope() && (getScope()->is(BlockScope::ProgramScope) ||
+                     getScope()-> getVariables()->
+                     isConvertibleSuperGlobal(m_globalName))) {
+    cg.printObjectHeader("SimpleVariableExpression", 2);
+    cg.printPropertyHeader("name");
+    cg.printValue(m_globalName);
+    cg.printPropertyHeader("sourceLocation");
+    cg.printLocation(this->getLocation());
+    cg.printObjectFooter();
+  } else if (m_offset) {
+    cg.printObjectHeader("BinaryOpExpression", 4);
+    cg.printPropertyHeader("expression1");
+    m_variable->outputCodeModel(cg);
+    cg.printPropertyHeader("expression2");
+    cg.printExpression(m_offset, false);
+    cg.printPropertyHeader("operation");
+    cg.printValue(PHP_ARRAY_ELEMENT);
+    cg.printPropertyHeader("sourceLocation");
+    cg.printLocation(this->getLocation());
+    cg.printObjectFooter();
+  } else {
+    cg.printObjectHeader("UnaryOpExpression", 3);
+    cg.printPropertyHeader("expression");
+    m_variable->outputCodeModel(cg);
+    cg.printPropertyHeader("operation");
+    cg.printValue(PHP_ARRAY_APPEND_POINT_OP);
+    cg.printPropertyHeader("sourceLocation");
+    cg.printLocation(this->getLocation());
+    cg.printObjectFooter();
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 

hphp/compiler/expression/array_pair_expression.cpp

@@ -17,7 +17,8 @@
 #include "hphp/compiler/expression/array_pair_expression.h"
 #include "hphp/compiler/expression/scalar_expression.h"
 #include "hphp/compiler/expression/unary_op_expression.h"
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/compiler/code_model_enums.h"
+#include "hphp/parser/hphp.tab.hpp"
 
 using namespace HPHP;
 
@@ -94,10 +95,10 @@ int ArrayPairExpression::getKidCount() const {
 void ArrayPairExpression::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_name = boost::dynamic_pointer_cast<Expression>(cp);
+      m_name = dynamic_pointer_cast<Expression>(cp);
       break;
     case 1:
-      m_value = boost::dynamic_pointer_cast<Expression>(cp);
+      m_value = dynamic_pointer_cast<Expression>(cp);
       break;
     default:
       assert(false);
@@ -122,6 +123,25 @@ bool ArrayPairExpression::canonCompare(ExpressionPtr e) const {
   return m_ref == a->m_ref;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void ArrayPairExpression::outputCodeModel(CodeGenerator &cg) {
+  if (m_name) {
+    cg.printObjectHeader("BinaryOpExpression", 4);
+    cg.printPropertyHeader("expression1");
+    m_name->outputCodeModel(cg);
+    cg.printPropertyHeader("expression2");
+    cg.printExpression(m_value, m_ref);
+    cg.printPropertyHeader("operation");
+    cg.printValue(PHP_ARRAY_PAIR);
+    cg.printPropertyHeader("sourceLocation");
+    cg.printLocation(this->getLocation());
+    cg.printObjectFooter();
+  } else {
+    cg.printExpression(m_value, m_ref);
+  }
+  return;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions

hphp/compiler/expression/assignment_expression.cpp

@@ -25,15 +25,16 @@
 #include "hphp/compiler/analysis/constant_table.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/expression/unary_op_expression.h"
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/parser/hphp.tab.hpp"
+#include "hphp/compiler/code_model_enums.h"
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/analysis/class_scope.h"
 #include "hphp/compiler/analysis/function_scope.h"
 #include "hphp/compiler/expression/scalar_expression.h"
 #include "hphp/compiler/expression/expression_list.h"
 #include "hphp/compiler/expression/simple_function_call.h"
-#include "hphp/runtime/base/complex_types.h"
-#include "hphp/runtime/base/builtin_functions.h"
+#include "hphp/runtime/base/complex-types.h"
+#include "hphp/runtime/base/builtin-functions.h"
 
 using namespace HPHP;
 
@@ -160,10 +161,10 @@ int AssignmentExpression::getKidCount() const {
 void AssignmentExpression::setNthKid(int n, ConstructPtr cp) {
   switch (m_rhsFirst ? 1 - n : n) {
     case 0:
-      m_variable = boost::dynamic_pointer_cast<Expression>(cp);
+      m_variable = dynamic_pointer_cast<Expression>(cp);
       break;
     case 1:
-      m_value = boost::dynamic_pointer_cast<Expression>(cp);
+      m_value = dynamic_pointer_cast<Expression>(cp);
       break;
     default:
       assert(false);
@@ -180,11 +181,11 @@ bool AssignmentExpression::isSimpleGlobalAssign(StringData **name,
   Variant v;
   if (!m_value->getScalarValue(v) || v.is(KindOfArray)) return false;
   if (name) {
-    *name = StringData::GetStaticString(ae->getGlobalName());
+    *name = makeStaticString(ae->getGlobalName());
   }
   if (tv) {
     if (v.isString()) {
-      v = StringData::GetStaticString(v.toCStrRef().get());
+      v = makeStaticString(v.toCStrRef().get());
     }
     *tv = *v.asTypedValue();
   }
@@ -306,6 +307,21 @@ TypePtr AssignmentExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
   return inferAssignmentTypes(ar, type, coerce, m_variable, m_value);
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void AssignmentExpression::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("BinaryOpExpression", 4);
+  cg.printPropertyHeader("expression1");
+  m_variable->outputCodeModel(cg);
+  cg.printPropertyHeader("expression2");
+  cg.printExpression(m_value, m_ref);
+  cg.printPropertyHeader("operation");
+  cg.printValue(PHP_ASSIGNMENT);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 

hphp/compiler/expression/await_expression.cpp

@@ -0,0 +1,105 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#include "hphp/compiler/expression/await_expression.h"
+#include "hphp/compiler/analysis/function_scope.h"
+#include "hphp/compiler/code_model_enums.h"
+
+using namespace HPHP;
+
+///////////////////////////////////////////////////////////////////////////////
+// constructors/destructors
+
+AwaitExpression::AwaitExpression(EXPRESSION_CONSTRUCTOR_PARAMETERS,
+ ExpressionPtr exp)
+  : Expression(EXPRESSION_CONSTRUCTOR_PARAMETER_VALUES(AwaitExpression)),
+    m_exp(exp), m_label(this) {
+}
+
+ExpressionPtr AwaitExpression::clone() {
+  AwaitExpressionPtr exp(new AwaitExpression(*this));
+  Expression::deepCopy(exp);
+  exp->m_exp = Clone(m_exp);
+  exp->m_label.setExpression(exp.get());
+  return exp;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// parser functions
+
+
+///////////////////////////////////////////////////////////////////////////////
+// static analysis functions
+
+void AwaitExpression::analyzeProgram(AnalysisResultPtr ar) {
+  assert(getFunctionScope() && getFunctionScope()->isAsync());
+  m_exp->analyzeProgram(ar);
+
+  m_label.setNew();
+}
+
+ConstructPtr AwaitExpression::getNthKid(int n) const {
+  switch (n) {
+    case 0:
+      return m_exp;
+    default:
+      assert(false);
+      break;
+  }
+  return ConstructPtr();
+}
+
+int AwaitExpression::getKidCount() const {
+  return 1;
+}
+
+void AwaitExpression::setNthKid(int n, ConstructPtr cp) {
+  switch (n) {
+    case 0:
+      m_exp = dynamic_pointer_cast<Expression>(cp);
+      break;
+    default:
+      assert(false);
+      break;
+  }
+}
+
+TypePtr AwaitExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
+                                    bool coerce) {
+  m_exp->inferAndCheck(ar, Type::Some, false);
+  return Type::Variant;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void AwaitExpression::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("UnaryOpExpression", 3);
+  cg.printPropertyHeader("expression");
+  m_exp->outputCodeModel(cg);
+  cg.printPropertyHeader("operation");
+  cg.printValue(PHP_AWAIT_OP);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// code generation functions
+
+void AwaitExpression::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
+  cg_printf("await ");
+  m_exp->outputPHP(cg, ar);
+}

hphp/compiler/expression/await_expression.h

@@ -0,0 +1,46 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef incl_HPHP_AWAIT_EXPRESSION_H_
+#define incl_HPHP_AWAIT_EXPRESSION_H_
+
+#include "hphp/compiler/expression/expression.h"
+#include "hphp/compiler/expression/generation_label.h"
+
+namespace HPHP {
+///////////////////////////////////////////////////////////////////////////////
+
+DECLARE_BOOST_TYPES(AwaitExpression);
+
+class AwaitExpression : public Expression {
+public:
+  AwaitExpression(EXPRESSION_CONSTRUCTOR_PARAMETERS,
+                  ExpressionPtr exp);
+
+  DECLARE_EXPRESSION_VIRTUAL_FUNCTIONS;
+
+  ExpressionPtr getExpression() { return m_exp; }
+  GenerationLabel& label() { return m_label; }
+
+private:
+  ExpressionPtr m_exp;
+  GenerationLabel m_label;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+}
+
+#endif // incl_HPHP_AWAIT_EXPRESSION_H_

hphp/compiler/expression/binary_op_expression.cpp

@@ -18,20 +18,22 @@
 #include "hphp/compiler/expression/array_element_expression.h"
 #include "hphp/compiler/expression/object_property_expression.h"
 #include "hphp/compiler/expression/unary_op_expression.h"
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/parser/hphp.tab.hpp"
 #include "hphp/compiler/expression/scalar_expression.h"
 #include "hphp/compiler/expression/constant_expression.h"
-#include "hphp/runtime/base/complex_types.h"
-#include "hphp/runtime/base/type_conversions.h"
-#include "hphp/runtime/base/builtin_functions.h"
+#include "hphp/compiler/code_model_enums.h"
+#include "hphp/runtime/base/complex-types.h"
+#include "hphp/runtime/base/type-conversions.h"
+#include "hphp/runtime/base/builtin-functions.h"
 #include "hphp/runtime/base/comparisons.h"
-#include "hphp/runtime/base/zend/zend_string.h"
+#include "hphp/runtime/base/zend-string.h"
 #include "hphp/compiler/expression/expression_list.h"
 #include "hphp/compiler/expression/encaps_list_expression.h"
 #include "hphp/compiler/expression/simple_function_call.h"
 #include "hphp/compiler/expression/simple_variable.h"
 #include "hphp/compiler/statement/loop_statement.h"
-#include "hphp/runtime/base/tv_arith.h"
+#include "hphp/runtime/base/tv-arith.h"
+#include "hphp/runtime/vm/runtime.h"
 
 using namespace HPHP;
 
@@ -65,17 +67,22 @@ BinaryOpExpression::BinaryOpExpression
     break;
   case T_COLLECTION: {
     std::string s = m_exp1->getLiteralString();
-    int cType = 0;
+    Collection::Type cType = Collection::InvalidType;
     if (strcasecmp(s.c_str(), "vector") == 0) {
       cType = Collection::VectorType;
-    } else if (strcasecmp(s.c_str(), "map") == 0) {
+    } else if (strcasecmp(s.c_str(), "map") == 0 ||
+               strcasecmp(s.c_str(), "stablemmap") == 0) {
       cType = Collection::MapType;
-    } else if (strcasecmp(s.c_str(), "stablemap") == 0) {
-      cType = Collection::StableMapType;
     } else if (strcasecmp(s.c_str(), "set") == 0) {
       cType = Collection::SetType;
     } else if (strcasecmp(s.c_str(), "pair") == 0) {
       cType = Collection::PairType;
+    } else if (strcasecmp(s.c_str(), "frozenvector") == 0) {
+      cType = Collection::FrozenVectorType;
+    } else if (strcasecmp(s.c_str(), "frozenmap") == 0) {
+      cType = Collection::FrozenMapType;
+    } else if (strcasecmp(s.c_str(), "frozenset") == 0) {
+      cType = Collection::FrozenSetType;
     }
     ExpressionListPtr el = static_pointer_cast<ExpressionList>(m_exp2);
     el->setCollectionType(cType);
@@ -243,10 +250,10 @@ int BinaryOpExpression::getKidCount() const {
 void BinaryOpExpression::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
   case 0:
-    m_exp1 = boost::dynamic_pointer_cast<Expression>(cp);
+    m_exp1 = dynamic_pointer_cast<Expression>(cp);
     break;
   case 1:
-    m_exp2 = boost::dynamic_pointer_cast<Expression>(cp);
+    m_exp2 = dynamic_pointer_cast<Expression>(cp);
     break;
   default:
     assert(false);
@@ -476,6 +483,9 @@ ExpressionPtr BinaryOpExpression::foldConst(AnalysisResultConstPtr ar) {
               ExpressionPtr aExp = m_exp1;
               ExpressionPtr bExp = binOpExp->m_exp1;
               ExpressionPtr cExp = binOpExp->m_exp2;
+              if (aExp->isArray() || bExp->isArray() || cExp->isArray()) {
+                break;
+              }
               m_exp1 = binOpExp = Clone(binOpExp);
               m_exp2 = cExp;
               binOpExp->m_exp1 = aExp;
@@ -536,6 +546,9 @@ ExpressionPtr BinaryOpExpression::foldConst(AnalysisResultConstPtr ar) {
           *result.asCell() = cellBitXor(*v1.asCell(), *v2.asCell());
           break;
         case '.':
+          if (v1.isArray() || v2.isArray()) {
+            return ExpressionPtr();
+          }
           result = concat(v1.toString(), v2.toString());
           break;
         case T_IS_IDENTICAL:
@@ -598,10 +611,27 @@ ExpressionPtr BinaryOpExpression::foldConst(AnalysisResultConstPtr ar) {
         case T_LOGICAL_AND:
           result = v1.toBoolean() && v2.toBoolean(); break;
         case T_INSTANCEOF: {
-          if (v1.isArray() && v2.isString() &&
-              interface_supports_array(v2.getStringData())) {
-            result = true;
-            break;
+          if (v2.isString()) {
+            if (v1.isArray() &&
+                interface_supports_array(v2.getStringData())) {
+              result = true;
+              break;
+            }
+            if (v1.isString() &&
+                interface_supports_string(v2.getStringData())) {
+              result = true;
+              break;
+            }
+            if (v1.isInteger() &&
+                interface_supports_int(v2.getStringData())) {
+              result = true;
+              break;
+            }
+            if (v1.isDouble() &&
+                interface_supports_double(v2.getStringData())) {
+              result = true;
+              break;
+            }
           }
           result = false;
           break;
@@ -785,7 +815,7 @@ TypePtr BinaryOpExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
   case T_COLLECTION:
     et1 = Type::Any;
     et2 = Type::Any;
-    rt = Type::Object;
+    rt = Type::CreateObjectType(m_exp1->getLiteralString());
     break;
   default:
     assert(false);
@@ -894,6 +924,76 @@ TypePtr BinaryOpExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
   return rt;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void BinaryOpExpression::outputCodeModel(CodeGenerator &cg) {
+  if (m_op == T_COLLECTION) {
+    cg.printObjectHeader("CollectionInitializerExpression", 3);
+    cg.printPropertyHeader("collection");
+    m_exp1->outputCodeModel(cg);
+    cg.printPropertyHeader("arguments");
+    cg.printExpressionVector(static_pointer_cast<ExpressionList>(m_exp2));
+    cg.printPropertyHeader("sourceLocation");
+    cg.printLocation(this->getLocation());
+    cg.printObjectFooter();
+    return;
+  }
+
+  cg.printObjectHeader("BinaryOpExpression", 4);
+  cg.printPropertyHeader("expression1");
+  m_exp1->outputCodeModel(cg);
+  cg.printPropertyHeader("expression2");
+  m_exp2->outputCodeModel(cg);
+  cg.printPropertyHeader("operation");
+
+  int op = 0;
+  switch (m_op) {
+    case T_PLUS_EQUAL: op = PHP_PLUS_ASSIGN; break;
+    case T_MINUS_EQUAL: op = PHP_MINUS_ASSIGN; break;
+    case T_MUL_EQUAL: op = PHP_MULTIPLY_ASSIGN; break;
+    case T_DIV_EQUAL: op = PHP_DIVIDE_ASSIGN; break;
+    case T_CONCAT_EQUAL: op = PHP_CONCAT_ASSIGN; break;
+    case T_MOD_EQUAL:  op = PHP_MODULUS_ASSIGN;  break;
+    case T_AND_EQUAL: op = PHP_AND_ASSIGN; break;
+    case T_OR_EQUAL: op = PHP_OR_ASSIGN;  break;
+    case T_XOR_EQUAL: op = PHP_XOR_ASSIGN; break;
+    case T_SL_EQUAL: op = PHP_SHIFT_LEFT_ASSIGN; break;
+    case T_SR_EQUAL: op = PHP_SHIFT_RIGHT_ASSIGN; break;
+    case T_BOOLEAN_OR: op = PHP_BOOLEAN_OR;  break;
+    case T_BOOLEAN_AND: op = PHP_BOOLEAN_AND; break;
+    case T_LOGICAL_OR: op = PHP_LOGICAL_OR; break;
+    case T_LOGICAL_AND: op = PHP_LOGICAL_AND;  break;
+    case T_LOGICAL_XOR: op = PHP_LOGICAL_XOR; break;
+    case '|': op = PHP_OR; break;
+    case '&': op = PHP_AND;  break;
+    case '^': op = PHP_XOR; break;
+    case '.': op = PHP_CONCAT; break;
+    case '+': op = PHP_PLUS; break;
+    case '-': op = PHP_MINUS; break;
+    case '*': op = PHP_MULTIPLY; break;
+    case '/': op = PHP_DIVIDE; break;
+    case '%': op = PHP_MODULUS; break;
+    case T_SL: op = PHP_SHIFT_LEFT; break;
+    case T_SR: op = PHP_SHIFT_RIGHT; break;
+    case T_IS_IDENTICAL: op = PHP_IS_IDENTICAL; break;
+    case T_IS_NOT_IDENTICAL: op = PHP_IS_NOT_IDENTICAL; break;
+    case T_IS_EQUAL: op = PHP_IS_EQUAL; break;
+    case T_IS_NOT_EQUAL: op = PHP_IS_NOT_EQUAL; break;
+    case '<': op = PHP_IS_SMALLER; break;
+    case T_IS_SMALLER_OR_EQUAL: op = PHP_IS_SMALLER_OR_EQUAL; break;
+    case '>': op = PHP_IS_GREATER; break;
+    case T_IS_GREATER_OR_EQUAL: op = PHP_IS_GREATER_OR_EQUAL;  break;
+    case T_INSTANCEOF: op = PHP_INSTANCEOF;  break;
+    default:
+      assert(false);
+  }
+
+  cg.printValue(op);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 
@@ -974,4 +1074,3 @@ bool BinaryOpExpression::isOpEqual() {
   }
   return false;
 }
-

hphp/compiler/expression/class_constant_expression.cpp

@@ -108,7 +108,7 @@ int ClassConstantExpression::getKidCount() const {
 void ClassConstantExpression::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_class = boost::dynamic_pointer_cast<Expression>(cp);
+      m_class = dynamic_pointer_cast<Expression>(cp);
       break;
     default:
       assert(false);
@@ -221,6 +221,18 @@ bool ClassConstantExpression::canonCompare(ExpressionPtr e) const {
     m_className == static_cast<ClassConstantExpression*>(e.get())->m_className;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void ClassConstantExpression::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("ClassPropertyExpression", 3);
+  cg.printPropertyHeader("className");
+  StaticClassName::outputCodeModel(cg);
+  cg.printPropertyHeader("propertyName");
+  cg.printValue(m_varName);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions

hphp/compiler/expression/class_constant_expression.h

@@ -46,6 +46,7 @@ public:
   bool isValid() const { return m_valid; }
   bool isDynamic() const;
   bool hasClass() const { return m_defScope != 0; }
+  bool isColonColonClass() const { return m_varName == "class"; }
 private:
   std::string m_varName;
   BlockScope *m_defScope;

hphp/compiler/expression/closure_expression.cpp

@@ -13,8 +13,11 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-
 #include "hphp/compiler/expression/closure_expression.h"
+
+#include <boost/make_shared.hpp>
+#include "folly/ScopeGuard.h"
+
 #include "hphp/compiler/expression/parameter_expression.h"
 #include "hphp/compiler/expression/expression_list.h"
 #include "hphp/compiler/expression/simple_variable.h"
@@ -24,73 +27,79 @@
 #include "hphp/compiler/analysis/function_scope.h"
 #include "hphp/compiler/analysis/file_scope.h"
 
-using namespace HPHP;
+namespace HPHP {
+
+//////////////////////////////////////////////////////////////////////
 
 TypePtr ClosureExpression::s_ClosureType =
   Type::CreateObjectType("closure"); // needs lower case
 
-///////////////////////////////////////////////////////////////////////////////
-// constructors/destructors
+ClosureExpression::ClosureExpression(
+    EXPRESSION_CONSTRUCTOR_PARAMETERS,
+    ClosureType type,
+    FunctionStatementPtr func,
+    ExpressionListPtr vars)
+  : Expression(EXPRESSION_CONSTRUCTOR_PARAMETER_VALUES(ClosureExpression))
+  , m_type(type)
+  , m_func(func)
+  , m_captureState(m_type == ClosureType::Short ? CaptureState::Unknown
+                                               : CaptureState::Known)
+{
+  switch (m_type) {
+  case ClosureType::Short:
+    break;
+  case ClosureType::Long:
+    if (vars) initializeFromUseList(vars);
+    break;
+  }
+}
 
-ClosureExpression::ClosureExpression
-(EXPRESSION_CONSTRUCTOR_PARAMETERS, FunctionStatementPtr func,
- ExpressionListPtr vars)
-    : Expression(EXPRESSION_CONSTRUCTOR_PARAMETER_VALUES(ClosureExpression)),
-      m_func(func) {
+void ClosureExpression::initializeFromUseList(ExpressionListPtr vars) {
+  m_vars = ExpressionListPtr(
+    new ExpressionList(vars->getScope(), vars->getLocation()));
 
-  if (vars) {
-    m_vars = ExpressionListPtr
-      (new ExpressionList(vars->getScope(), vars->getLocation()));
-    // push the vars in reverse order, not retaining duplicates
-    std::set<string> seenBefore;
+  // Because PHP is insane you can have a use variable with the same
+  // name as a param name.
+  // In that case, params win (which is different than zend but much easier)
+  auto seenBefore = collectParamNames();
 
-    // Because PHP is insane you can have a use variable with the same
-    // name as a param name.
-    // In that case, params win (which is different than zend but much easier)
-    ExpressionListPtr bodyParams = m_func->getParams();
-    if (bodyParams) {
-      int nParams = bodyParams->getCount();
-      for (int i = 0; i < nParams; i++) {
-        ParameterExpressionPtr par(
-          static_pointer_cast<ParameterExpression>((*bodyParams)[i]));
-        seenBefore.insert(par->getName());
-      }
+  for (int i = vars->getCount() - 1; i >= 0; i--) {
+    ParameterExpressionPtr param(
+      dynamic_pointer_cast<ParameterExpression>((*vars)[i]));
+    assert(param);
+    if (param->getName() == "this") {
+      // "this" is automatically included.
+      // Once we get rid of all the callsites, make this an error
+      continue;
     }
-
-    for (int i = vars->getCount() - 1; i >= 0; i--) {
-      ParameterExpressionPtr param(
-        dynamic_pointer_cast<ParameterExpression>((*vars)[i]));
-      assert(param);
-      if (param->getName() == "this") {
-        // "this" is automatically included.
-        // Once we get rid of all the callsites, make this an error
-        continue;
-      }
-      if (seenBefore.find(param->getName().c_str()) == seenBefore.end()) {
-        seenBefore.insert(param->getName().c_str());
-        m_vars->insertElement(param);
-      }
-    }
-
-    if (m_vars) {
-      m_values = ExpressionListPtr
-        (new ExpressionList(m_vars->getScope(), m_vars->getLocation()));
-      for (int i = 0; i < m_vars->getCount(); i++) {
-        ParameterExpressionPtr param =
-          dynamic_pointer_cast<ParameterExpression>((*m_vars)[i]);
-        const string &name = param->getName();
-
-        SimpleVariablePtr var(new SimpleVariable(param->getScope(),
-                                                 param->getLocation(),
-                                                 name));
-        if (param->isRef()) {
-          var->setContext(RefValue);
-        }
-        m_values->addElement(var);
-      }
-      assert(m_vars->getCount() == m_values->getCount());
+    if (seenBefore.find(param->getName().c_str()) == seenBefore.end()) {
+      seenBefore.insert(param->getName().c_str());
+      m_vars->insertElement(param);
     }
   }
+
+  initializeValuesFromVars();
+}
+
+void ClosureExpression::initializeValuesFromVars() {
+  if (!m_vars) return;
+
+  m_values = ExpressionListPtr
+    (new ExpressionList(m_vars->getScope(), m_vars->getLocation()));
+  for (int i = 0; i < m_vars->getCount(); i++) {
+    ParameterExpressionPtr param =
+      dynamic_pointer_cast<ParameterExpression>((*m_vars)[i]);
+    const string &name = param->getName();
+
+    SimpleVariablePtr var(new SimpleVariable(param->getScope(),
+                                             param->getLocation(),
+                                             name));
+    if (param->isRef()) {
+      var->setContext(RefValue);
+    }
+    m_values->addElement(var);
+  }
+  assert(m_vars->getCount() == m_values->getCount());
 }
 
 ExpressionPtr ClosureExpression::clone() {
@@ -124,7 +133,7 @@ int ClosureExpression::getKidCount() const {
 void ClosureExpression::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_values = boost::dynamic_pointer_cast<ExpressionList>(cp);
+      m_values = dynamic_pointer_cast<ExpressionList>(cp);
       break;
     default:
       assert(false);
@@ -137,62 +146,65 @@ void ClosureExpression::setNthKid(int n, ConstructPtr cp) {
 
 void ClosureExpression::analyzeProgram(AnalysisResultPtr ar) {
   m_func->analyzeProgram(ar);
-  if (m_vars) {
-    m_values->analyzeProgram(ar);
 
-    if (ar->getPhase() == AnalysisResult::AnalyzeAll) {
-      getFunctionScope()->addUse(m_func->getFunctionScope(),
-                                 BlockScope::UseKindClosure);
-      m_func->getFunctionScope()->setClosureVars(m_vars);
+  if (m_vars) analyzeVars(ar);
 
-      // closure function's variable table (not containing function's)
-      VariableTablePtr variables = m_func->getFunctionScope()->getVariables();
-      VariableTablePtr containing = getFunctionScope()->getVariables();
-      for (int i = 0; i < m_vars->getCount(); i++) {
-        ParameterExpressionPtr param =
-          dynamic_pointer_cast<ParameterExpression>((*m_vars)[i]);
-        const string &name = param->getName();
-        {
-          Symbol *containingSym = containing->addDeclaredSymbol(name, param);
-          containingSym->setPassClosureVar();
-
-          Symbol *sym = variables->addDeclaredSymbol(name, param);
-          sym->setClosureVar();
-          sym->setDeclaration(ConstructPtr());
-          if (param->isRef()) {
-            sym->setRefClosureVar();
-            sym->setUsed();
-          } else {
-            sym->clearRefClosureVar();
-            sym->clearUsed();
-          }
-        }
-      }
-      return;
-    }
-    if (ar->getPhase() == AnalysisResult::AnalyzeFinal) {
-      // closure function's variable table (not containing function's)
-      VariableTablePtr variables = m_func->getFunctionScope()->getVariables();
-      for (int i = 0; i < m_vars->getCount(); i++) {
-        ParameterExpressionPtr param =
-          dynamic_pointer_cast<ParameterExpression>((*m_vars)[i]);
-        const string &name = param->getName();
-
-        // so we can assign values to them, instead of seeing CVarRef
-        Symbol *sym = variables->getSymbol(name);
-        if (sym && sym->isParameter()) {
-          sym->setLvalParam();
-        }
-      }
-    }
-  }
-
-  FunctionScopeRawPtr container = 
+  FunctionScopeRawPtr container =
     getFunctionScope()->getContainingNonClosureFunction();
   if (container && container->isStatic()) {
     m_func->getModifiers()->add(T_STATIC);
   }
+}
 
+void ClosureExpression::analyzeVars(AnalysisResultPtr ar) {
+  m_values->analyzeProgram(ar);
+
+  if (ar->getPhase() == AnalysisResult::AnalyzeAll) {
+    getFunctionScope()->addUse(m_func->getFunctionScope(),
+                               BlockScope::UseKindClosure);
+    m_func->getFunctionScope()->setClosureVars(m_vars);
+
+    // closure function's variable table (not containing function's)
+    VariableTablePtr variables = m_func->getFunctionScope()->getVariables();
+    VariableTablePtr containing = getFunctionScope()->getVariables();
+    for (int i = 0; i < m_vars->getCount(); i++) {
+      ParameterExpressionPtr param =
+        dynamic_pointer_cast<ParameterExpression>((*m_vars)[i]);
+      const string &name = param->getName();
+      {
+        Symbol *containingSym = containing->addDeclaredSymbol(name, param);
+        containingSym->setPassClosureVar();
+
+        Symbol *sym = variables->addDeclaredSymbol(name, param);
+        sym->setClosureVar();
+        sym->setDeclaration(ConstructPtr());
+        if (param->isRef()) {
+          sym->setRefClosureVar();
+          sym->setUsed();
+        } else {
+          sym->clearRefClosureVar();
+          sym->clearUsed();
+        }
+      }
+    }
+    return;
+  }
+
+  if (ar->getPhase() == AnalysisResult::AnalyzeFinal) {
+    // closure function's variable table (not containing function's)
+    VariableTablePtr variables = m_func->getFunctionScope()->getVariables();
+    for (int i = 0; i < m_vars->getCount(); i++) {
+      ParameterExpressionPtr param =
+        dynamic_pointer_cast<ParameterExpression>((*m_vars)[i]);
+      const string &name = param->getName();
+
+      // so we can assign values to them, instead of seeing CVarRef
+      Symbol *sym = variables->getSymbol(name);
+      if (sym && sym->isParameter()) {
+        sym->setLvalParam();
+      }
+    }
+  }
 }
 
 TypePtr ClosureExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
@@ -256,6 +268,72 @@ TypePtr ClosureExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
   return s_ClosureType;
 }
 
+void ClosureExpression::setCaptureList(
+    AnalysisResultPtr ar,
+    const std::set<std::string>& captureNames) {
+  assert(m_captureState == CaptureState::Unknown);
+  m_captureState = CaptureState::Known;
+
+  bool usedThis = false;
+  SCOPE_EXIT {
+    /*
+     * TODO: closures in a non-class scope should be neither static
+     * nor non-static, but right now we don't really have this idea.
+     *
+     * This would allow not having to check for a $this or late bound
+     * class in the closure object or on the ActRec when returning
+     * from those closures.
+     *
+     * (We could also mark closures that don't use late static binding
+     * with this flag to avoid checks on closures in member functions
+     * when they use neither $this nor static::)
+     */
+    if (!usedThis) m_func->getModifiers()->add(T_STATIC);
+  };
+
+  if (captureNames.empty()) return;
+
+  m_vars = ExpressionListPtr(
+    new ExpressionList(getOriginalScope(), getLocation()));
+
+  for (auto const& name : captureNames) {
+    if (name == "this") {
+      usedThis = true;
+      continue;
+    }
+
+    auto expr = ParameterExpressionPtr(new ParameterExpression(
+      BlockScopePtr(getOriginalScope()),
+      getLocation(),
+      TypeAnnotationPtr(),
+      true /* hhType */,
+      name,
+      false /* ref */,
+      0 /* token modifier thing */,
+      ExpressionPtr(),
+      ExpressionPtr()
+    ));
+    m_vars->insertElement(expr);
+  }
+
+  initializeValuesFromVars();
+  analyzeVars(ar);
+}
+
+std::set<std::string> ClosureExpression::collectParamNames() const {
+  std::set<std::string> ret;
+
+  auto bodyParams = m_func->getParams();
+  if (!bodyParams) return ret;
+
+  int nParams = bodyParams->getCount();
+  for (int i = 0; i < nParams; i++) {
+    auto par = static_pointer_cast<ParameterExpression>((*bodyParams)[i]);
+    ret.insert(par->getName());
+  }
+  return ret;
+}
+
 bool ClosureExpression::hasStaticLocals() {
   ConstructPtr cons(m_func);
   return hasStaticLocalsImpl(cons);
@@ -284,6 +362,22 @@ bool ClosureExpression::hasStaticLocalsImpl(ConstructPtr root) {
   return false;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void ClosureExpression::outputCodeModel(CodeGenerator &cg) {
+  auto numProps = m_vars != nullptr && m_vars->getCount() > 0 ? 3 : 2;
+  cg.printObjectHeader("ClosureExpression", numProps);
+  cg.printPropertyHeader("ffunction");
+  m_func->outputCodeModel(cg);
+  if (m_vars != nullptr && m_vars->getCount() > 0) {
+    cg.printPropertyHeader("capturedVariables");
+    cg.printExpressionVector(m_vars);
+  }
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 
@@ -296,3 +390,5 @@ void ClosureExpression::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
   }
   m_func->outputPHPBody(cg, ar);
 }
+
+}

hphp/compiler/expression/closure_expression.h

@@ -18,6 +18,7 @@
 #define incl_HPHP_CLOSURE_EXPRESSION_H_
 
 #include "hphp/compiler/expression/expression.h"
+#include "hphp/parser/parser.h"
 
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,10 +30,20 @@ DECLARE_BOOST_TYPES(ExpressionList);
 class ClosureExpression : public Expression {
 public:
   ClosureExpression(EXPRESSION_CONSTRUCTOR_PARAMETERS,
-                    FunctionStatementPtr func, ExpressionListPtr vars);
+                    ClosureType type,
+                    FunctionStatementPtr func,
+                    ExpressionListPtr vars);
 
   DECLARE_BASE_EXPRESSION_VIRTUAL_FUNCTIONS;
 
+  // Flag for whether we have already determined the capture list for
+  // this lambda.
+  enum class CaptureState {
+    Unknown,
+    Known,
+  };
+  CaptureState captureState() const { return m_captureState; }
+
   virtual ConstructPtr getNthKid(int n) const;
   virtual void setNthKid(int n, ConstructPtr cp);
   virtual int getKidCount() const;
@@ -40,16 +51,38 @@ public:
   FunctionStatementPtr getClosureFunction() { return m_func; }
   ExpressionListPtr getClosureVariables() { return m_vars; }
   ExpressionListPtr getClosureValues() { return m_values; }
+  StringData* getClosureClassName() { return m_closureClassName; }
+  void setClosureClassName(StringData* value) { m_closureClassName = value; }
   bool hasStaticLocals();
+  ClosureType type() const { return m_type; }
+  std::set<std::string> collectParamNames() const;
+
+  /*
+   * Initialize the capture list for a closure that uses automatic
+   * captures.
+   *
+   * Pre: captureState() == CaptureState::Unknown.
+   */
+  void setCaptureList(AnalysisResultPtr ar,
+                      const std::set<std::string>&);
 
 private:
+  static TypePtr s_ClosureType;
+
+private:
+  void initializeFromUseList(ExpressionListPtr vars);
+  void initializeValuesFromVars();
+  void analyzeVars(AnalysisResultPtr);
+  bool hasStaticLocalsImpl(ConstructPtr root);
+
+private:
+  ClosureType m_type;
   FunctionStatementPtr m_func;
   ExpressionListPtr m_vars;
   ExpressionListPtr m_values;
-
-  static TypePtr s_ClosureType;
-
-  bool hasStaticLocalsImpl(ConstructPtr root);
+  StringData* m_closureClassName;
+  std::set<std::string> m_unboundNames;
+  CaptureState m_captureState;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

hphp/compiler/expression/constant_expression.cpp

@@ -26,7 +26,7 @@
 #include "hphp/util/util.h"
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/parser/parser.h"
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/parser/hphp.tab.hpp"
 #include "hphp/compiler/expression/scalar_expression.h"
 #include "hphp/runtime/ext/ext_misc.h"
 
@@ -273,6 +273,17 @@ TypePtr ConstantExpression::inferTypes(AnalysisResultPtr ar, TypePtr type,
   return actualType;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void ConstantExpression::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("SimpleVariableExpression", 2);
+  cg.printPropertyHeader("variableName");
+  cg.printValue(m_origName);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 

hphp/compiler/expression/dynamic_function_call.cpp

@@ -78,13 +78,18 @@ ExpressionPtr DynamicFunctionCall::preOptimize(AnalysisResultConstPtr ar) {
     if (m_nameExp->getScalarValue(v) &&
         v.isString()) {
       string name = v.toString().c_str();
-      ExpressionPtr cls = m_class;
-      if (!cls && !m_className.empty()) {
-        cls = makeScalarExpression(ar, m_className);
+      // if the name starts with a '\' give up any early optimizations and
+      // let FPushFunc manage the namespace normalizations at runtime
+      // (some static analyzer may still be able to optimize it - e.g. HHBBC)
+      if (name[0] != '\\') {
+        ExpressionPtr cls = m_class;
+        if (!cls && !m_className.empty()) {
+          cls = makeScalarExpression(ar, m_className);
+        }
+        return ExpressionPtr(NewSimpleFunctionCall(
+          getScope(), getLocation(),
+          name, false, m_params, cls));
       }
-      return ExpressionPtr(NewSimpleFunctionCall(
-        getScope(), getLocation(),
-        name, false, m_params, cls));
     }
   }
   return ExpressionPtr();
@@ -113,6 +118,26 @@ TypePtr DynamicFunctionCall::inferTypes(AnalysisResultPtr ar, TypePtr type,
   return Type::Variant;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void DynamicFunctionCall::outputCodeModel(CodeGenerator &cg) {
+  if (m_class || !m_className.empty()) {
+    cg.printObjectHeader("ClassMethodCallExpression", 4);
+    cg.printPropertyHeader("className");
+    StaticClassName::outputCodeModel(cg);
+    cg.printPropertyHeader("methodExpression");
+  } else {
+    cg.printObjectHeader("SimpleFunctionCallExpression", 3);
+    cg.printPropertyHeader("functionExpression");
+  }
+  m_nameExp->outputCodeModel(cg);
+  cg.printPropertyHeader("arguments");
+  cg.printExpressionVector(m_params);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(m_nameExp->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 void DynamicFunctionCall::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {

hphp/compiler/expression/dynamic_variable.cpp

@@ -19,6 +19,7 @@
 #include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/analysis/file_scope.h"
+#include "hphp/compiler/code_model_enums.h"
 
 using namespace HPHP;
 
@@ -66,7 +67,7 @@ int DynamicVariable::getKidCount() const {
 void DynamicVariable::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_exp = boost::dynamic_pointer_cast<Expression>(cp);
+      m_exp = dynamic_pointer_cast<Expression>(cp);
       break;
     default:
       assert(false);
@@ -87,6 +88,19 @@ TypePtr DynamicVariable::inferTypes(AnalysisResultPtr ar, TypePtr type,
   return m_implementedType = Type::Variant;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void DynamicVariable::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("UnaryOpExpression", 3);
+  cg.printPropertyHeader("expression");
+  m_exp->outputCodeModel(cg);
+  cg.printPropertyHeader("operation");
+  cg.printValue(PHP_DYNAMIC_VARIABLE_OP) ;
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 

hphp/compiler/expression/encaps_list_expression.cpp

@@ -18,7 +18,7 @@
 #include "hphp/compiler/expression/expression_list.h"
 #include "hphp/compiler/expression/binary_op_expression.h"
 #include "hphp/compiler/analysis/code_error.h"
-#include "hphp/runtime/base/builtin_functions.h"
+#include "hphp/runtime/base/builtin-functions.h"
 
 using namespace HPHP;
 
@@ -70,7 +70,7 @@ int EncapsListExpression::getKidCount() const {
 void EncapsListExpression::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_exps = boost::dynamic_pointer_cast<ExpressionList>(cp);
+      m_exps = dynamic_pointer_cast<ExpressionList>(cp);
       break;
     default:
       assert(false);
@@ -119,6 +119,19 @@ bool EncapsListExpression::canonCompare(ExpressionPtr e) const {
   return m_type == el->m_type;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void EncapsListExpression::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("EncapsListExpression", 3);
+  cg.printPropertyHeader("delimiter");
+  cg.printValue(m_type);
+  cg.printPropertyHeader("expressions");
+  cg.printExpressionVector(m_exps);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 

hphp/compiler/expression/expression.cpp

@@ -17,7 +17,7 @@
 #include "hphp/compiler/expression/expression.h"
 #include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/parser/parser.h"
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/parser/hphp.tab.hpp"
 #include "hphp/util/util.h"
 #include "hphp/compiler/analysis/class_scope.h"
 #include "hphp/compiler/analysis/function_scope.h"
@@ -30,12 +30,13 @@
 #include "hphp/compiler/expression/array_element_expression.h"
 #include "hphp/compiler/expression/object_property_expression.h"
 #include "hphp/compiler/expression/unary_op_expression.h"
+#include "hphp/compiler/expression/binary_op_expression.h"
 #include "hphp/compiler/analysis/constant_table.h"
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/expression/function_call.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/util/hash.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array-iterator.h"
 
 using namespace HPHP;
 
@@ -368,7 +369,7 @@ void Expression::setTypes(AnalysisResultConstPtr ar, TypePtr actualType,
   }
 
   if (m_actualType->isSpecificObject()) {
-    boost::const_pointer_cast<AnalysisResult>(ar)->
+    std::const_pointer_cast<AnalysisResult>(ar)->
       addClassDependency(getFileScope(), m_actualType->getName());
   }
 }
@@ -674,6 +675,14 @@ bool Expression::isArray() const {
   return false;
 }
 
+bool Expression::isCollection() const {
+  if (is(KindOfBinaryOpExpression)) {
+    return
+      static_cast<const BinaryOpExpression*>(this)->getOp() == T_COLLECTION;
+  }
+  return false;
+}
+
 bool Expression::isUnquotedScalar() const {
   if (!is(KindOfScalarExpression)) return false;
   return !((ScalarExpression*)this)->isQuoted();

hphp/compiler/expression/expression.h

@@ -17,6 +17,8 @@
 #ifndef incl_HPHP_EXPRESSION_H_
 #define incl_HPHP_EXPRESSION_H_
 
+#include "hphp/util/deprecated/declare-boost-types.h"
+#include "hphp/util/hash-map-typedefs.h"
 #include "hphp/compiler/construct.h"
 #include "hphp/compiler/analysis/type.h"
 #include "hphp/compiler/analysis/analysis_result.h"
@@ -36,6 +38,7 @@
   virtual ExpressionPtr clone();                                        \
   virtual TypePtr inferTypes(AnalysisResultPtr ar, TypePtr type,        \
                              bool coerce);                              \
+  virtual void outputCodeModel(CodeGenerator &cg);                      \
   virtual void outputPHP(CodeGenerator &cg, AnalysisResultPtr ar);
 #define DECLARE_EXPRESSION_VIRTUAL_FUNCTIONS                            \
   DECLARE_BASE_EXPRESSION_VIRTUAL_FUNCTIONS;                            \
@@ -47,7 +50,7 @@ namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
 DECLARE_BOOST_TYPES(Statement);
-DECLARE_BOOST_TYPES(Expression);
+DECLARE_EXTENDED_BOOST_TYPES(Expression);
 class Variant;
 
 #define DECLARE_EXPRESSION_TYPES(x)             \
@@ -76,7 +79,18 @@ class Variant;
     x(EncapsListExpression, None),              \
     x(ClosureExpression, None),                 \
     x(YieldExpression, None),                   \
-    x(UserAttribute, None)
+    x(AwaitExpression, None),                   \
+    x(UserAttribute, None),                     \
+    x(QueryExpression, None),                   \
+    x(FromClause, None),                        \
+    x(LetClause, None),                         \
+    x(WhereClause, None),                       \
+    x(SelectClause, None),                      \
+    x(IntoClause, None),                        \
+    x(JoinClause, None),                        \
+    x(GroupClause, None),                       \
+    x(OrderbyClause, None),                     \
+    x(Ordering, None)
 
 class Expression : public Construct {
 public:
@@ -202,7 +216,7 @@ public:
     */
   virtual int getKidCount() const { return 0; }
   ExpressionPtr getNthExpr(int n) const { return
-      boost::static_pointer_cast<Expression>(getNthKid(n)); }
+      static_pointer_cast<Expression>(getNthKid(n)); }
 
   /**
    * For cse & canonicalization
@@ -232,6 +246,7 @@ public:
   virtual bool isTemporary() const { return false; }
   virtual bool isScalar() const { return false; }
   bool isArray() const;
+  bool isCollection() const;
   virtual bool isRefable(bool checkError = false) const { return false; }
   virtual bool getScalarValue(Variant &value) { return false; }
   FileScopeRawPtr getUsedScalarScope(CodeGenerator& cg);
@@ -347,6 +362,10 @@ public:
     return isNoRemove() && m_assertedType;
   }
 
+  virtual bool allowCellByRef() const {
+    return false;
+  }
+
   static ExpressionPtr MakeConstant(AnalysisResultConstPtr ar,
                                     BlockScopePtr scope,
                                     LocationPtr loc,

hphp/compiler/expression/expression_list.cpp

@@ -22,7 +22,7 @@
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/expression/array_pair_expression.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array-init.h"
 #include "hphp/compiler/parser/parser.h"
 
 using namespace HPHP;
@@ -33,7 +33,6 @@ using namespace HPHP;
 ExpressionList::ExpressionList(EXPRESSION_CONSTRUCTOR_PARAMETERS,
                                ListKind kind)
   : Expression(EXPRESSION_CONSTRUCTOR_PARAMETER_VALUES(ExpressionList)),
-    m_outputCount(-1),
     m_arrayElements(false), m_collectionType(0), m_kind(kind) {
 }
 
@@ -231,37 +230,26 @@ void ExpressionList::stripConcat() {
   for (int i = 0; i < el.getCount(); ) {
     ExpressionPtr &e = el[i];
     if (e->is(Expression::KindOfUnaryOpExpression)) {
-      UnaryOpExpressionPtr u(boost::static_pointer_cast<UnaryOpExpression>(e));
+      UnaryOpExpressionPtr u(static_pointer_cast<UnaryOpExpression>(e));
       if (u->getOp() == '(') {
         e = u->getExpression();
       }
     }
     if (e->is(Expression::KindOfBinaryOpExpression)) {
       BinaryOpExpressionPtr b
-        (boost::static_pointer_cast<BinaryOpExpression>(e));
+        (static_pointer_cast<BinaryOpExpression>(e));
       if (b->getOp() == '.') {
-        e = b->getExp1();
-        el.insertElement(b->getExp2(), i + 1);
-        continue;
+        if(!b->getExp1()->isArray() && !b->getExp2()->isArray()) {
+          e = b->getExp1();
+          el.insertElement(b->getExp2(), i + 1);
+          continue;
+        }
       }
     }
     i++;
   }
 }
 
-void ExpressionList::setOutputCount(int count) {
-  assert(count >= 0 && count <= (int)m_exps.size());
-  m_outputCount = count;
-}
-
-int ExpressionList::getOutputCount() const {
-  return m_outputCount < 0 ? m_exps.size() : m_outputCount;
-}
-
-void ExpressionList::resetOutputCount() {
-  m_outputCount = -1;
-}
-
 void ExpressionList::markParam(int p, bool noRefWrapper) {
   ExpressionPtr param = (*this)[p];
   if (param->hasContext(Expression::InvokeArgument)) {
@@ -286,7 +274,7 @@ void ExpressionList::markParams(bool noRefWrapper) {
   }
 }
 
-void ExpressionList::setCollectionType(int cType) {
+void ExpressionList::setCollectionType(Collection::Type cType) {
   m_arrayElements = true;
   m_collectionType = cType;
 }
@@ -335,7 +323,7 @@ void ExpressionList::setNthKid(int n, ConstructPtr cp) {
   if (n >= m) {
     assert(false);
   } else {
-    m_exps[n] = boost::dynamic_pointer_cast<Expression>(cp);
+    m_exps[n] = dynamic_pointer_cast<Expression>(cp);
   }
 }
 
@@ -478,6 +466,19 @@ bool ExpressionList::canonCompare(ExpressionPtr e) const {
          m_kind == l->m_kind;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+void ExpressionList::outputCodeModel(CodeGenerator &cg) {
+  for (unsigned int i = 0; i < m_exps.size(); i++) {
+    ExpressionPtr exp = m_exps[i];
+    if (exp) {
+      cg.printExpression(exp, exp->hasContext(RefParameter));
+    } else {
+      cg.printNull();
+    }
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // code generation functions
 
@@ -513,4 +514,3 @@ unsigned int ExpressionList::checkLitstrKeys() const {
   }
   return keys.size();
 }
-

hphp/compiler/expression/expression_list.h

@@ -73,15 +73,7 @@ public:
   void markParam(int p, bool noRefWrapper);
   void markParams(bool noRefWrapper);
 
-  void setCollectionType(int cType);
-
-  /**
-   * When a function call has too many arguments, we only want to output
-   * max number of arguments, by limiting output count of subexpressions.
-   */
-  void setOutputCount(int count);
-  int getOutputCount() const;
-  void resetOutputCount();
+  void setCollectionType(Collection::Type cType);
 
   virtual bool canonCompare(ExpressionPtr e) const;
 
@@ -97,7 +89,6 @@ private:
   unsigned int checkLitstrKeys() const;
 
   ExpressionPtrVec m_exps;
-  int m_outputCount;
   bool m_arrayElements;
   int m_collectionType;
   ListKind m_kind;

hphp/compiler/expression/function_call.cpp

@@ -35,7 +35,7 @@
 #include "hphp/compiler/expression/parameter_expression.h"
 #include "hphp/compiler/expression/assignment_expression.h"
 #include "hphp/compiler/expression/unary_op_expression.h"
-#include "hphp/util/parser/hphp.tab.hpp"
+#include "hphp/parser/hphp.tab.hpp"
 
 using namespace HPHP;
 
@@ -120,13 +120,13 @@ int FunctionCall::getKidCount() const {
 void FunctionCall::setNthKid(int n, ConstructPtr cp) {
   switch (n) {
     case 0:
-      m_class = boost::dynamic_pointer_cast<Expression>(cp);
+      m_class = dynamic_pointer_cast<Expression>(cp);
       break;
     case 1:
-      m_nameExp = boost::dynamic_pointer_cast<Expression>(cp);
+      m_nameExp = dynamic_pointer_cast<Expression>(cp);
       break;
     case 2:
-      m_params = boost::dynamic_pointer_cast<ExpressionList>(cp);
+      m_params = dynamic_pointer_cast<ExpressionList>(cp);
       break;
     default:
       assert(false);
@@ -171,39 +171,43 @@ void FunctionCall::markRefParams(FunctionScopePtr func,
   }
 }
 
+void FunctionCall::checkParamTypeCodeErrors(AnalysisResultPtr ar) {
+  if (!m_funcScope || m_arrayParams) return;
+  for (int i = 0, n = m_funcScope->getMaxParamCount(); i < n; ++i) {
+    TypePtr specType = m_funcScope->getParamTypeSpec(i);
+    if (!specType) continue;
+
+    const char *fmt = 0;
+    string ptype;
+    if (!m_params || m_params->getCount() <= i) {
+      if (i >= m_funcScope->getMinParamCount()) break;
+      fmt = "parameter %d of %s() requires %s, none given";
+    } else {
+      ExpressionPtr param = (*m_params)[i];
+      if (!Type::Inferred(ar, param->getType(), specType)) {
+        fmt = "parameter %d of %s() requires %s, called with %s";
+      }
+      ptype = param->getType()->toString();
+    }
+    if (fmt) {
+      string msg;
+      Util::string_printf
+        (msg, fmt,
+         i + 1,
+         Util::escapeStringForCPP(m_funcScope->getOriginalName()).c_str(),
+         specType->toString().c_str(), ptype.c_str());
+      Compiler::Error(Compiler::BadArgumentType,
+                      shared_from_this(), msg);
+    }
+  }
+}
+
 void FunctionCall::analyzeProgram(AnalysisResultPtr ar) {
   if (m_class) m_class->analyzeProgram(ar);
   if (m_nameExp) m_nameExp->analyzeProgram(ar);
   if (m_params) m_params->analyzeProgram(ar);
   if (ar->getPhase() == AnalysisResult::AnalyzeFinal) {
-    if (m_funcScope && !m_arrayParams) {
-      for (int i = 0, n = m_funcScope->getMaxParamCount(); i < n; ++i) {
-        if (TypePtr specType = m_funcScope->getParamTypeSpec(i)) {
-          const char *fmt = 0;
-          string ptype;
-          if (!m_params || m_params->getCount() <= i) {
-            if (i >= m_funcScope->getMinParamCount()) break;
-            fmt = "parameter %d of %s() requires %s, none given";
-          } else {
-            ExpressionPtr param = (*m_params)[i];
-            if (!Type::Inferred(ar, param->getType(), specType)) {
-              fmt = "parameter %d of %s() requires %s, called with %s";
-            }
-            ptype = param->getType()->toString();
-          }
-          if (fmt) {
-            string msg;
-            Util::string_printf
-              (msg, fmt,
-               i + 1,
-               Util::escapeStringForCPP(m_funcScope->getOriginalName()).c_str(),
-               specType->toString().c_str(), ptype.c_str());
-            Compiler::Error(Compiler::BadArgumentType,
-                            shared_from_this(), msg);
-          }
-        }
-      }
-    }
+    checkParamTypeCodeErrors(ar);
   }
 }
 
@@ -545,6 +549,15 @@ TypePtr FunctionCall::checkParamsAndReturn(AnalysisResultPtr ar,
     assert(!func->inVisitScopes() || getScope() == func);
     frt = func->getReturnType();
   }
+
+  // fix return type for generators and async functions here, keep the
+  // infered return type in function scope to allow further optimizations
+  if (func->isGenerator()) {
+    frt = Type::GetType(Type::KindOfObject, "Continuation");
+  } else if (func->isAsync()) {
+    frt = Type::GetType(Type::KindOfObject, "WaitHandle");
+  }
+
   if (!frt) {
     m_voidReturn = true;
     setActualType(TypePtr());

hphp/compiler/expression/function_call.h

@@ -65,6 +65,9 @@ public:
   bool isValid() const { return m_valid; }
   bool hadBackslash() const { return m_hadBackslash; }
 
+private:
+  void checkParamTypeCodeErrors(AnalysisResultPtr);
+
 protected:
   ExpressionPtr m_nameExp;
   std::string m_name;

hphp/compiler/expression/generation_label.cpp

@@ -0,0 +1,49 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#include "hphp/compiler/expression/generation_label.h"
+
+#include "hphp/compiler/analysis/function_scope.h"
+#include "hphp/compiler/expression/expression.h"
+
+namespace HPHP {
+
+GenerationLabel::GenerationLabel(Expression* e)
+  : m_id(-1)
+  , m_generation(-1)
+  , m_owner(e)
+{}
+
+int GenerationLabel::id() const {
+  assert(m_id >= 1);
+  assert(m_generation ==
+         m_owner->getFunctionScope()->getYieldLabelGeneration());
+  return m_id;
+}
+
+void GenerationLabel::setNew() {
+  auto func = m_owner->getFunctionScope();
+  auto newGen = func->getYieldLabelGeneration();
+  assert(m_generation < newGen);
+  m_generation = newGen;
+  m_id = func->allocYieldLabel();
+}
+
+void GenerationLabel::setExpression(Expression* e) {
+  m_owner = e;
+}
+
+}

hphp/compiler/expression/generation_label.h

@@ -0,0 +1,40 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef incl_HPHP_COMPILER_GENERATION_LABEL_H
+#define incl_HPHP_COMPILER_GENERATION_LABEL_H
+
+namespace HPHP {
+
+class Expression;
+
+class GenerationLabel {
+ public:
+  explicit GenerationLabel(Expression* e);
+
+  int id() const;
+  void setNew();
+  void setExpression(Expression* e);
+
+ private:
+  int m_id;
+  int m_generation;
+  Expression* m_owner;
+};
+
+}
+
+#endif

hphp/compiler/expression/group_clause.cpp

@@ -0,0 +1,111 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#include "hphp/compiler/expression/group_clause.h"
+#include "hphp/compiler/analysis/code_error.h"
+#include "hphp/runtime/base/complex-types.h"
+
+using namespace HPHP;
+
+///////////////////////////////////////////////////////////////////////////////
+// constructors/destructors
+
+GroupClause::GroupClause
+(EXPRESSION_CONSTRUCTOR_PARAMETERS,
+    ExpressionPtr coll, ExpressionPtr key)
+  : Expression(EXPRESSION_CONSTRUCTOR_PARAMETER_VALUES(GroupClause)),
+    m_coll(coll), m_key(key) {
+}
+
+ExpressionPtr GroupClause::clone() {
+  GroupClausePtr exp(new GroupClause(*this));
+  Expression::deepCopy(exp);
+  exp->m_coll = Clone(m_coll);
+  exp->m_key = Clone(m_key);
+  return exp;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// parser functions
+
+///////////////////////////////////////////////////////////////////////////////
+// static analysis functions
+
+void GroupClause::analyzeProgram(AnalysisResultPtr ar) {
+  m_coll->analyzeProgram(ar);
+  m_key->analyzeProgram(ar);
+}
+
+ConstructPtr GroupClause::getNthKid(int n) const {
+  switch (n) {
+    case 0:
+      return m_coll;
+    case 1:
+      return m_key;
+    default:
+      assert(false);
+      break;
+  }
+  return ConstructPtr();
+}
+
+int GroupClause::getKidCount() const {
+  return 2;
+}
+
+void GroupClause::setNthKid(int n, ConstructPtr cp) {
+  switch (n) {
+    case 0:
+      m_coll = dynamic_pointer_cast<Expression>(cp);
+      break;
+    case 1:
+      m_key = dynamic_pointer_cast<Expression>(cp);
+      break;
+    default:
+      break;
+  }
+}
+
+TypePtr GroupClause::inferTypes(AnalysisResultPtr ar, TypePtr type,
+                                bool coerce) {
+  m_coll->inferAndCheck(ar, Type::Some, false);
+  m_key->inferAndCheck(ar, Type::Some, false);
+  return Type::Object;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+void GroupClause::outputCodeModel(CodeGenerator &cg) {
+  cg.printObjectHeader("GroupClause", 3);
+  cg.printPropertyHeader("collection");
+  m_coll->outputCodeModel(cg);
+  cg.printPropertyHeader("key");
+  m_key->outputCodeModel(cg);
+  cg.printPropertyHeader("sourceLocation");
+  cg.printLocation(this->getLocation());
+  cg.printObjectFooter();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// code generation functions
+
+void GroupClause::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
+  cg_printf("group ");
+  m_coll->outputPHP(cg, ar);
+  cg_printf(" by ");
+  m_key->outputPHP(cg, ar);
+}
+

hphp/compiler/expression/group_clause.h

@@ -0,0 +1,45 @@
+/*
+   +----------------------------------------------------------------------+
+   | HipHop for PHP                                                       |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com)     |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef incl_HPHP_GROUP_CLAUSE_H_
+#define incl_HPHP_GROUP_CLAUSE_H_
+
+#include "hphp/compiler/expression/expression.h"
+#include "hphp/compiler/expression/expression_list.h"
+
+namespace HPHP {
+///////////////////////////////////////////////////////////////////////////////
+
+DECLARE_BOOST_TYPES(GroupClause);
+
+class GroupClause : public Expression {
+public:
+  GroupClause(EXPRESSION_CONSTRUCTOR_PARAMETERS,
+    ExpressionPtr coll, ExpressionPtr key);
+
+  DECLARE_EXPRESSION_VIRTUAL_FUNCTIONS;
+
+  ExpressionPtr getColl() { return m_coll; }
+  ExpressionPtr getKey() { return m_key; }
+private:
+  ExpressionPtr m_coll;
+  ExpressionPtr m_key;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+}
+
+#endif // incl_HPHP_GROUP_CLAUSE_H_