1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 02:37:36 +00:00

LibJS: Do not use the $ special character in file names

The dollar sign is a special character in POSIX shells and in the Ninja
build file format. If the file name contains a `$`, something goes wrong
in the escaping/unescaping of this symbol, and CMake/GCC/Clang generate
invalid dependency files where not all instances of `$` are escaped
properly. Because of this, Ninja fails to rebuild `$262Object.cpp` if
the headers included by it have changed.

Stale `$262Object.cpp.o` files have been the cause of mysterious crashes
multiple times which only go away after doing a clean build. Let's
prevent these from happening again by removing the `$` from the
filename.
This commit is contained in:
Daniel Bertalan 2023-07-15 13:38:57 +02:00 committed by Tim Flynn
parent 2b46e6f664
commit e64a8751d1
7 changed files with 8 additions and 9 deletions

View file

@ -39,10 +39,7 @@ paths = []
for containing_path in PATHS_TO_SEARCH:
for root, dirs, files in os.walk(userland_path / containing_path):
for file in files:
# FIXME: The dollar sign in $262Object.cpp gets corrupted in compile_commands.json somehow, and
# ends up as "\\$$262Object.cpp". This results in a clang error, so we just ignore the
# file here
if file.endswith('.cpp') and not file.endswith('262Object.cpp'):
if file.endswith('.cpp'):
paths.append(Path(root) / file)

View file

@ -36,10 +36,10 @@ shared_library("LibJS") {
"Bytecode/RegexTable.cpp",
"Bytecode/StringTable.cpp",
"Console.cpp",
"Contrib/Test262/262Object.cpp",
"Contrib/Test262/AgentObject.cpp",
"Contrib/Test262/GlobalObject.cpp",
"Contrib/Test262/IsHTMLDDA.cpp",
"Contrib/Test262/\$262Object.cpp",
"CyclicModule.cpp",
"Heap/BlockAllocator.cpp",
"Heap/Cell.cpp",

View file

@ -18,7 +18,7 @@ set(SOURCES
Bytecode/RegexTable.cpp
Bytecode/StringTable.cpp
Console.cpp
Contrib/Test262/$262Object.cpp
Contrib/Test262/262Object.cpp
Contrib/Test262/AgentObject.cpp
Contrib/Test262/GlobalObject.cpp
Contrib/Test262/IsHTMLDDA.cpp

View file

@ -5,9 +5,11 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
// NOTE: This file is not named $262Object.cpp because dollar signs in file names cause issues with some build tools.
#include <AK/TypeCasts.h>
#include <LibJS/Bytecode/Interpreter.h>
#include <LibJS/Contrib/Test262/$262Object.h>
#include <LibJS/Contrib/Test262/262Object.h>
#include <LibJS/Contrib/Test262/AgentObject.h>
#include <LibJS/Contrib/Test262/GlobalObject.h>
#include <LibJS/Contrib/Test262/IsHTMLDDA.h>

View file

@ -5,7 +5,7 @@
*/
#include <AK/Format.h>
#include <LibJS/Contrib/Test262/$262Object.h>
#include <LibJS/Contrib/Test262/262Object.h>
#include <LibJS/Contrib/Test262/AgentObject.h>
#include <LibJS/Contrib/Test262/GlobalObject.h>
#include <LibJS/Heap/Cell.h>

View file

@ -6,7 +6,7 @@
#pragma once
#include <LibJS/Contrib/Test262/$262Object.h>
#include <LibJS/Contrib/Test262/262Object.h>
#include <LibJS/Runtime/GlobalObject.h>
namespace JS::Test262 {