Kill Compiler::Error and various Expression:: attributes

Summary: Nobody looks at the Compiler::Error results; and most of the useful ones are no longer even generated. Reviewed By: ricklavoie, alexeyt Differential Revision: D6874242 fbshipit-source-id: 3fd90119bae10582c08d85dcc9bb350b4ff9169a
facebook · Feb 2, 2018 · 9767a87 · 9767a87
1 parent 107e1d3
commit 9767a87
Show file tree

Hide file tree

Showing 63 changed files with 6 additions and 567 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,6 @@ hphp.log
 /hphp/test/vm/perf/*.diff
 /hphp/test/vm/perf/*.perf
 /hphp/runtime/ext_hhvm/ext_noinline.cpp
-/hphp/compiler/analysis/code_error.inc
 /hphp/runtime/ext/*/CMakeLists.txt
 /hphp/runtime/ext/*/*.so
 

diff --git a/hphp/.gitignore b/hphp/.gitignore
@@ -11,7 +11,6 @@ CMakeFiles
 /CMakeCache.txt
 cmake_install.cmake
 Makefile
-/compiler/analysis/code_error.inc
 /runtime/ir-opcode-generated.h
 /util/generated-compiler-id.txt
 /util/generated-repo-schema-id.txt

diff --git a/hphp/compiler/CMakeLists.txt b/hphp/compiler/CMakeLists.txt
@@ -13,21 +13,6 @@ auto_sources(files "*.h" "{$SOURCE_SUBDIRS}")
 list(APPEND HEADER_SOURCES ${files})
 HHVM_PUBLIC_HEADERS(compiler ${files})
 
-
-set(ERROR_INC "analysis/core_code_error.inc")
-
-set(ERROR_INC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/analysis/code_error.inc")
-
-file(REMOVE "${ERROR_INC_FILE}")
-
-file(WRITE "${ERROR_INC_FILE}" "/* This file is auto generated */")
-
-foreach (error_file ${ERROR_INC})
-  file(READ ${error_file} file_contents)
-
-  file(APPEND "${ERROR_INC_FILE}" "${file_contents}")
-endforeach (error_file ${ERROR_INC})
-
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../")
 
 set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_SOURCE_DIR}/bin")

diff --git a/hphp/compiler/analysis/analysis_result.cpp b/hphp/compiler/analysis/analysis_result.cpp
@@ -28,7 +28,6 @@
 #include <vector>
 
 #include "hphp/compiler/analysis/class_scope.h"
-#include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/exceptions.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/analysis/function_scope.h"

diff --git a/hphp/compiler/analysis/analysis_result.h b/hphp/compiler/analysis/analysis_result.h
@@ -18,7 +18,6 @@
 #define incl_HPHP_ANALYSIS_RESULT_H_
 
 #include "hphp/compiler/code_generator.h"
-#include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/option.h"
 #include "hphp/compiler/analysis/block_scope.h"
 #include "hphp/compiler/analysis/function_container.h"

diff --git a/hphp/compiler/analysis/class_scope.cpp b/hphp/compiler/analysis/class_scope.cpp
@@ -17,7 +17,6 @@
 #include "hphp/compiler/analysis/class_scope.h"
 
 #include "hphp/compiler/analysis/analysis_result.h"
-#include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/analysis/function_scope.h"
 #include "hphp/compiler/construct.h"
@@ -73,7 +72,6 @@ ClassScope::ClassScope(FileScopeRawPtr fs,
   for (unsigned i = 0; i < attrs.size(); ++i) {
     if (m_userAttributes.find(attrs[i]->getName()) != m_userAttributes.end()) {
       attrs[i]->parseTimeFatal(fs,
-                               Compiler::DeclaredAttributeTwice,
                                "Redeclared attribute %s",
                                attrs[i]->getName().c_str());
     }
@@ -258,7 +256,6 @@ bool ClassScope::addFunction(AnalysisResultConstRawPtr /*ar*/,
   FunctionScopePtr &func = m_functions[funcScope->getScopeName()];
   if (func) {
     func->getStmt()->parseTimeFatal(fileScope,
-                                    Compiler::DeclaredMethodTwice,
                                     "Redeclared method %s::%s",
                                     getScopeName().c_str(),
                                     func->getScopeName().c_str());

diff --git a/hphp/compiler/analysis/code_error.cpp b/hphp/compiler/analysis/code_error.cpp
diff --git a/hphp/compiler/analysis/code_error.h b/hphp/compiler/analysis/code_error.h
diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp
@@ -40,7 +40,6 @@
 
 #include "hphp/compiler/builtin_symbols.h"
 #include "hphp/compiler/analysis/class_scope.h"
-#include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/compiler/analysis/function_scope.h"
 #include "hphp/compiler/expression/array_element_expression.h"
@@ -12444,8 +12443,6 @@ void emitAllHHBC(AnalysisResultPtr&& ar) {
     TypeConstraint tc;
   }
 
-  Compiler::ClearErrors();
-
   JobQueueDispatcher<EmitterWorker>
     dispatcher(threadCount, 0, false, ar.get());
 

diff --git a/hphp/compiler/analysis/file_scope.cpp b/hphp/compiler/analysis/file_scope.cpp
@@ -21,7 +21,6 @@
 
 #include "hphp/compiler/analysis/analysis_result.h"
 #include "hphp/compiler/analysis/class_scope.h"
-#include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/function_scope.h"
 
 #include "hphp/compiler/expression/closure_expression.h"

diff --git a/hphp/compiler/analysis/file_scope.h b/hphp/compiler/analysis/file_scope.h
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "hphp/compiler/analysis/block_scope.h"
-#include "hphp/compiler/analysis/code_error.h"
 #include "hphp/compiler/analysis/function_container.h"
 #include "hphp/compiler/hphp.h"