From eb6a15d52bea353a63577f14ce32aeee2b80a0b0 Mon Sep 17 00:00:00 2001 From: Itamar Date: Tue, 13 Jul 2021 20:37:28 +0300 Subject: [PATCH] LibCpp: Only store error messages for the main parser state There's no need to store parser error messages for states with depth > 0, as they will eventually be popped from the states stack and their error messages will never be displayed to the user. Profiling shows that this change reduces the % of backtraces that contain the store_state & load_state functions from ~95% to ~70%. Empirically this change reduces the time it takes on my machine for the c++ language server to handle a file that #includes from ~14sec to ~4sec. --- Userland/Libraries/LibCpp/Parser.cpp | 6 +++++- Userland/Libraries/LibCpp/Parser.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibCpp/Parser.cpp b/Userland/Libraries/LibCpp/Parser.cpp index 22f4ce4fed4..3155d20b31e 100644 --- a/Userland/Libraries/LibCpp/Parser.cpp +++ b/Userland/Libraries/LibCpp/Parser.cpp @@ -894,6 +894,10 @@ Vector Parser::tokens_in_range(Position start, Position end) const void Parser::error(StringView message) { LOG_SCOPE(); + + if (!m_saved_states.is_empty()) + return; + if (message.is_null() || message.is_empty()) message = ""; String formatted_message; @@ -907,7 +911,7 @@ void Parser::error(StringView message) m_tokens[m_state.token_index].start().column); } - m_state.errors.append(formatted_message); + m_errors.append(formatted_message); } bool Parser::match_expression() diff --git a/Userland/Libraries/LibCpp/Parser.h b/Userland/Libraries/LibCpp/Parser.h index 665d8f71ee1..b2a5721db53 100644 --- a/Userland/Libraries/LibCpp/Parser.h +++ b/Userland/Libraries/LibCpp/Parser.h @@ -33,7 +33,7 @@ public: String text_of_node(const ASTNode&) const; StringView text_of_token(const Cpp::Token& token) const; void print_tokens() const; - const Vector& errors() const { return m_state.errors; } + const Vector& errors() const { return m_errors; } const Preprocessor::Definitions& preprocessor_definitions() const { return m_preprocessor_definitions; } struct TodoEntry { @@ -147,7 +147,6 @@ private: struct State { size_t token_index { 0 }; - Vector errors; NonnullRefPtrVector nodes; }; @@ -200,6 +199,7 @@ private: State m_state; Vector m_saved_states; RefPtr m_root_node; + Vector m_errors; Vector m_replaced_preprocessor_tokens; };