summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/ci.yml3
-rw-r--r--src/core/class_db.cpp7
-rw-r--r--tools/android.py5
-rw-r--r--tools/common_compiler_flags.py30
-rw-r--r--tools/godotcpp.py8
-rw-r--r--tools/ios.py5
-rw-r--r--tools/linux.py4
-rw-r--r--tools/macos.py5
-rw-r--r--tools/web.py4
-rw-r--r--tools/windows.py8
10 files changed, 76 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7204d3f..563ec72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,6 @@ jobs:
env:
SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
EM_VERSION: 3.1.39
- EM_CACHE_FOLDER: emsdk-cache
steps:
- name: Checkout
@@ -126,7 +125,7 @@ jobs:
uses: mymindstorm/setup-emsdk@v14
with:
version: ${{ env.EM_VERSION }}
- actions-cache-folder: ${{ env.EM_CACHE_FOLDER }}
+ no-cache: true
- name: Setup MinGW for Windows/MinGW build
if: matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes'
diff --git a/src/core/class_db.cpp b/src/core/class_db.cpp
index fd7d246..7a46f89 100644
--- a/src/core/class_db.cpp
+++ b/src/core/class_db.cpp
@@ -355,9 +355,14 @@ void ClassDB::add_virtual_method(const StringName &p_class, const MethodInfo &p_
if (mi.argument_count > 0) {
mi.arguments = (GDExtensionPropertyInfo *)memalloc(sizeof(GDExtensionPropertyInfo) * mi.argument_count);
mi.arguments_metadata = (GDExtensionClassMethodArgumentMetadata *)memalloc(sizeof(GDExtensionClassMethodArgumentMetadata) * mi.argument_count);
+ if (mi.argument_count != p_method.arguments_metadata.size()) {
+ WARN_PRINT("Mismatch argument metadata count for virtual method: " + String(p_class) + "::" + p_method.name);
+ }
for (uint32_t i = 0; i < mi.argument_count; i++) {
mi.arguments[i] = p_method.arguments[i]._to_gdextension();
- mi.arguments_metadata[i] = p_method.arguments_metadata[i];
+ if (i < p_method.arguments_metadata.size()) {
+ mi.arguments_metadata[i] = p_method.arguments_metadata[i];
+ }
}
} else {
mi.arguments = nullptr;
diff --git a/tools/android.py b/tools/android.py
index 0222121..fee4ed2 100644
--- a/tools/android.py
+++ b/tools/android.py
@@ -120,4 +120,9 @@ def generate(env):
env.Append(CPPDEFINES=["ANDROID_ENABLED", "UNIX_ENABLED"])
+ # Refer to https://github.com/godotengine/godot/blob/master/platform/android/detect.py
+ # LTO benefits for Android (size, performance) haven't been clearly established yet.
+ if env["lto"] == "auto":
+ env["lto"] = "none"
+
common_compiler_flags.generate(env)
diff --git a/tools/common_compiler_flags.py b/tools/common_compiler_flags.py
index 6a1fb69..e645f39 100644
--- a/tools/common_compiler_flags.py
+++ b/tools/common_compiler_flags.py
@@ -22,6 +22,10 @@ def exists(env):
def generate(env):
+ assert env["lto"] in ["thin", "full", "none"], "Unrecognized lto: {}".format(env["lto"])
+ if env["lto"] != "none":
+ print("Using LTO: " + env["lto"])
+
# Require C++17
if env.get("is_msvc", False):
env.Append(CXXFLAGS=["/std:c++17"])
@@ -64,6 +68,22 @@ def generate(env):
env.Append(LINKFLAGS=["/OPT:REF"])
elif env["optimize"] == "debug" or env["optimize"] == "none":
env.Append(CCFLAGS=["/Od"])
+
+ if env["lto"] == "thin":
+ if not env["use_llvm"]:
+ print("ThinLTO is only compatible with LLVM, use `use_llvm=yes` or `lto=full`.")
+ env.Exit(255)
+
+ env.Append(CCFLAGS=["-flto=thin"])
+ env.Append(LINKFLAGS=["-flto=thin"])
+ elif env["lto"] == "full":
+ if env["use_llvm"]:
+ env.Append(CCFLAGS=["-flto"])
+ env.Append(LINKFLAGS=["-flto"])
+ else:
+ env.AppendUnique(CCFLAGS=["/GL"])
+ env.AppendUnique(ARFLAGS=["/LTCG"])
+ env.AppendUnique(LINKFLAGS=["/LTCG"])
else:
if env["debug_symbols"]:
# Adding dwarf-4 explicitly makes stacktraces work with clang builds,
@@ -91,3 +111,13 @@ def generate(env):
env.Append(CCFLAGS=["-Og"])
elif env["optimize"] == "none":
env.Append(CCFLAGS=["-O0"])
+
+ if env["lto"] == "thin":
+ if (env["platform"] == "windows" or env["platform"] == "linux") and not env["use_llvm"]:
+ print("ThinLTO is only compatible with LLVM, use `use_llvm=yes` or `lto=full`.")
+ env.Exit(255)
+ env.Append(CCFLAGS=["-flto=thin"])
+ env.Append(LINKFLAGS=["-flto=thin"])
+ elif env["lto"] == "full":
+ env.Append(CCFLAGS=["-flto"])
+ env.Append(LINKFLAGS=["-flto"])
diff --git a/tools/godotcpp.py b/tools/godotcpp.py
index afa3c49..47a202e 100644
--- a/tools/godotcpp.py
+++ b/tools/godotcpp.py
@@ -326,6 +326,14 @@ def options(opts, env):
("none", "custom", "debug", "speed", "speed_trace", "size"),
)
)
+ opts.Add(
+ EnumVariable(
+ "lto",
+ "Link-time optimization",
+ "none",
+ ("none", "auto", "thin", "full"),
+ )
+ )
opts.Add(BoolVariable("debug_symbols", "Build with debugging symbols", True))
opts.Add(BoolVariable("dev_build", "Developer build with dev-only debugging code (DEV_ENABLED)", False))
opts.Add(BoolVariable("verbose", "Enable verbose output for the compilation", False))
diff --git a/tools/ios.py b/tools/ios.py
index 9675ab1..25c17db 100644
--- a/tools/ios.py
+++ b/tools/ios.py
@@ -97,4 +97,9 @@ def generate(env):
env.Append(CPPDEFINES=["IOS_ENABLED", "UNIX_ENABLED"])
+ # Refer to https://github.com/godotengine/godot/blob/master/platform/ios/detect.py:
+ # Disable by default as it makes linking in Xcode very slow.
+ if env["lto"] == "auto":
+ env["lto"] = "none"
+
common_compiler_flags.generate(env)
diff --git a/tools/linux.py b/tools/linux.py
index 0b26878..9e85d88 100644
--- a/tools/linux.py
+++ b/tools/linux.py
@@ -39,4 +39,8 @@ def generate(env):
env.Append(CPPDEFINES=["LINUX_ENABLED", "UNIX_ENABLED"])
+ # Refer to https://github.com/godotengine/godot/blob/master/platform/linuxbsd/detect.py
+ if env["lto"] == "auto":
+ env["lto"] = "full"
+
common_compiler_flags.generate(env)
diff --git a/tools/macos.py b/tools/macos.py
index 7418150..f88e47f 100644
--- a/tools/macos.py
+++ b/tools/macos.py
@@ -73,4 +73,9 @@ def generate(env):
env.Append(CPPDEFINES=["MACOS_ENABLED", "UNIX_ENABLED"])
+ # Refer to https://github.com/godotengine/godot/blob/master/platform/macos/detect.py
+ # LTO benefits for macOS (size, performance) haven't been clearly established yet.
+ if env["lto"] == "auto":
+ env["lto"] = "none"
+
common_compiler_flags.generate(env)
diff --git a/tools/web.py b/tools/web.py
index e878a78..f1a4418 100644
--- a/tools/web.py
+++ b/tools/web.py
@@ -52,4 +52,8 @@ def generate(env):
env.Append(CPPDEFINES=["WEB_ENABLED", "UNIX_ENABLED"])
+ # Refer to https://github.com/godotengine/godot/blob/master/platform/web/detect.py
+ if env["lto"] == "auto":
+ env["lto"] = "full"
+
common_compiler_flags.generate(env)
diff --git a/tools/windows.py b/tools/windows.py
index 2e8d609..490b9f7 100644
--- a/tools/windows.py
+++ b/tools/windows.py
@@ -198,4 +198,12 @@ def generate(env):
env.Append(CPPDEFINES=["WINDOWS_ENABLED"])
+ # Refer to https://github.com/godotengine/godot/blob/master/platform/windows/detect.py
+ if env["lto"] == "auto":
+ if env.get("is_msvc", False):
+ # No LTO by default for MSVC, doesn't help.
+ env["lto"] = "none"
+ else: # Release
+ env["lto"] = "full"
+
common_compiler_flags.generate(env)