id
int64
0
886
original_context
stringlengths
648
56.6k
modified_context
stringlengths
587
47.6k
omitted_context
listlengths
0
19
omitted_index
listlengths
0
19
metadata
dict
700
diff --git a/SConstruct b/SConstruct index bcc2094f0541..8e3e06c52f2e 100644 --- a/SConstruct +++ b/SConstruct @@ -1156,15 +1156,6 @@ if env["vsproj"]: env["CPPPATH"] = [Dir(path) for path in env["CPPPATH"]] methods.generate_vs_project(env, ARGUMENTS, env["vsproj_name"]) -# Check for the existence of header...
diff --git a/SConstruct b/SConstruct index bcc2094f0541..8e3e06c52f2e 100644 --- a/SConstruct +++ b/SConstruct @@ -1156,15 +1156,6 @@ if env["vsproj"]: env["CPPPATH"] = [Dir(path) for path in env["CPPPATH"]] methods.generate_vs_project(env, ARGUMENTS, env["vsproj_name"]) -# Check for the existence of headers ...
[ "-if \"check_c_headers\" in env:", "- if conf.CheckCHeader(header):" ]
[ 10, 13 ]
{ "additions": 5, "author": "Repiteo", "deletions": 16, "html_url": "https://github.com/godotengine/godot/pull/103865", "issue_id": 103865, "merged_at": "2025-04-25T16:42:00Z", "omission_probability": 0.1, "pr_number": 103865, "repo": "godotengine/godot", "title": "SCons: Remove `check_c_headers`", ...
701
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/CSharpInstanceBridge.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/CSharpInstanceBridge.cs index 7b6b35b68fe3..d17b7327822c 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/CSharpInstanceBridge.cs +++ b/modules/mono/glue/GodotSh...
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/CSharpInstanceBridge.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/CSharpInstanceBridge.cs index 7b6b35b68fe3..d17b7327822c 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/CSharpInstanceBridge.cs +++ b/modules/mono/glue/GodotSh...
[]
[]
{ "additions": 10, "author": "Delsin-Yu", "deletions": 0, "html_url": "https://github.com/godotengine/godot/pull/104689", "issue_id": 104689, "merged_at": "2025-04-15T00:42:51Z", "omission_probability": 0.1, "pr_number": 104689, "repo": "godotengine/godot", "title": "[.Net] Avoid unnecessary StringN...
702
diff --git a/doc/classes/LineEdit.xml b/doc/classes/LineEdit.xml index 426c3bbb6080..469601f51fe8 100644 --- a/doc/classes/LineEdit.xml +++ b/doc/classes/LineEdit.xml @@ -133,6 +133,22 @@ [b]Warning:[/b] This is a required internal node, removing and freeing it may cause a crash. If you wish to hide it or any of i...
diff --git a/doc/classes/LineEdit.xml b/doc/classes/LineEdit.xml index 426c3bbb6080..469601f51fe8 100644 --- a/doc/classes/LineEdit.xml +++ b/doc/classes/LineEdit.xml @@ -133,6 +133,22 @@ [b]Warning:[/b] This is a required internal node, removing and freeing it may cause a crash. If you wish to hide it or any of i...
[ "+\t\t\t\t[b]Note:[/b] To check at caret location use [code]get_previous_composite_character_column(get_caret_line(), get_caret_column())[/code]", "+\t\t\tfrom_column = get_line(to_line - 1).length();", "+\tint delete_char_offset = 1;", "+\tif (!caret_mid_grapheme_enabled && backspace_deletes_composite_charac...
[ 67, 94, 113, 114, 138, 143, 179, 248, 273 ]
{ "additions": 139, "author": "Koyper", "deletions": 5, "html_url": "https://github.com/godotengine/godot/pull/105656", "issue_id": 105656, "merged_at": "2025-04-24T14:14:24Z", "omission_probability": 0.1, "pr_number": 105656, "repo": "godotengine/godot", "title": "[LineEdit/TextEdit] Add composite ...
703
diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp index d8857c06c88b..3f8a459453a3 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.cpp +++ b/servers/audio/effects/audio_effect_pitch_shift.cpp @@ -160,8 +160,13 @@ void SMBPitchShift::PitchShi...
diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp index d8857c06c88b..3f8a459453a3 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.cpp +++ b/servers/audio/effects/audio_effect_pitch_shift.cpp @@ -160,8 +160,13 @@ void SMBPitchShift::PitchShi...
[]
[]
{ "additions": 8, "author": "akien-mga", "deletions": 3, "html_url": "https://github.com/godotengine/godot/pull/105744", "issue_id": 105744, "merged_at": "2025-04-25T12:26:35Z", "omission_probability": 0.1, "pr_number": 105744, "repo": "godotengine/godot", "title": "AudioEffectPitchShift: 3rd attemp...
704
diff --git a/core/crypto/crypto_core.cpp b/core/crypto/crypto_core.cpp index 13852d517794..9d2c346e3ae1 100644 --- a/core/crypto/crypto_core.cpp +++ b/core/crypto/crypto_core.cpp @@ -214,8 +214,8 @@ Error CryptoCore::AESContext::decrypt_cfb(size_t p_length, uint8_t p_iv[16], con } // CryptoCore -String CryptoCore::...
diff --git a/core/crypto/crypto_core.cpp b/core/crypto/crypto_core.cpp index 13852d517794..9d2c346e3ae1 100644 --- a/core/crypto/crypto_core.cpp +++ b/core/crypto/crypto_core.cpp @@ -214,8 +214,8 @@ Error CryptoCore::AESContext::decrypt_cfb(size_t p_length, uint8_t p_iv[16], con // CryptoCore -String CryptoCore::b64_e...
[ "-Error CryptoCore::b64_encode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len) {", "-Error CryptoCore::b64_decode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len) {", "+Error CryptoCore::b64_decode(uint8_t *r_dst, size_t p_dst_len, size_t *r_l...
[ 19, 25, 26, 64 ]
{ "additions": 13, "author": "akien-mga", "deletions": 13, "html_url": "https://github.com/godotengine/godot/pull/104960", "issue_id": 104960, "merged_at": "2025-04-03T14:34:53Z", "omission_probability": 0.1, "pr_number": 104960, "repo": "godotengine/godot", "title": "CryptoCore: Use `size_t` for bu...
705
diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h index 547006d1915d..0cbd42377f06 100644 --- a/core/templates/local_vector.h +++ b/core/templates/local_vector.h @@ -126,11 +126,14 @@ class LocalVector { return occurrences; } - void invert() { + void reverse() { for (U i = 0; i < coun...
diff --git a/core/templates/local_vector.h b/core/templates/local_vector.h index 547006d1915d..0cbd42377f06 100644 --- a/core/templates/local_vector.h +++ b/core/templates/local_vector.h @@ -126,11 +126,14 @@ class LocalVector { return occurrences; - void invert() { + void reverse() { for (U i = 0; i < count / 2;...
[]
[]
{ "additions": 12, "author": "Ivorforce", "deletions": 9, "html_url": "https://github.com/godotengine/godot/pull/101027", "issue_id": 101027, "merged_at": "2025-04-24T22:23:37Z", "omission_probability": 0.1, "pr_number": 101027, "repo": "godotengine/godot", "title": "Rename `LocalVector.invert()` ->...
706
diff --git a/doc/classes/ResourceImporterScene.xml b/doc/classes/ResourceImporterScene.xml index 1565a244fe23..f14eb6d1e8ff 100644 --- a/doc/classes/ResourceImporterScene.xml +++ b/doc/classes/ResourceImporterScene.xml @@ -68,8 +68,11 @@ <member name="nodes/root_type" type="String" setter="" getter="" default="&quot...
diff --git a/doc/classes/ResourceImporterScene.xml b/doc/classes/ResourceImporterScene.xml index 1565a244fe23..f14eb6d1e8ff 100644 --- a/doc/classes/ResourceImporterScene.xml +++ b/doc/classes/ResourceImporterScene.xml @@ -68,8 +68,11 @@ <member name="nodes/root_type" type="String" setter="" getter="" default="&quot...
[ "+\tif (p_options.has(\"nodes/use_name_suffixes\")) {" ]
[ 36 ]
{ "additions": 16, "author": "aaronfranke", "deletions": 1, "html_url": "https://github.com/godotengine/godot/pull/105014", "issue_id": 105014, "merged_at": "2025-04-24T22:23:37Z", "omission_probability": 0.1, "pr_number": 105014, "repo": "godotengine/godot", "title": "Allow completely opting out of...
707
diff --git a/modules/gltf/doc_classes/GLTFDocument.xml b/modules/gltf/doc_classes/GLTFDocument.xml index 47ffc624bad9..46492958a1d2 100644 --- a/modules/gltf/doc_classes/GLTFDocument.xml +++ b/modules/gltf/doc_classes/GLTFDocument.xml @@ -126,6 +126,9 @@ How to process the root node during export. See [enum RootNod...
diff --git a/modules/gltf/doc_classes/GLTFDocument.xml b/modules/gltf/doc_classes/GLTFDocument.xml index 47ffc624bad9..46492958a1d2 100644 --- a/modules/gltf/doc_classes/GLTFDocument.xml +++ b/modules/gltf/doc_classes/GLTFDocument.xml @@ -126,6 +126,9 @@ How to process the root node during export. See [enum RootNod...
[ "+\t\t<constant name=\"VISIBILITY_MODE_INCLUDE_REQUIRED\" value=\"0\" enum=\"VisibilityMode\">", "+\t\tPropertyInfo visibility_mode_prop = PropertyInfo(Variant::INT, \"visibility_mode\", PROPERTY_HINT_ENUM, \"Include & Required,Include & Optional,Exclude\");", "+\t\t\tif (!p_state->extensions_used.has(\"KHR_nod...
[ 18, 97, 115, 142, 180, 250, 279, 324 ]
{ "additions": 108, "author": "aaronfranke", "deletions": 18, "html_url": "https://github.com/godotengine/godot/pull/93722", "issue_id": 93722, "merged_at": "2025-04-24T22:23:37Z", "omission_probability": 0.1, "pr_number": 93722, "repo": "godotengine/godot", "title": "Implement `KHR_node_visibility`...
708
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 16a7578d8acd..2f960beccac9 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -3437,7 +3437,7 @@ Error EditorFileSystem::make_dir_recursive(const String &p_path, const String &p ERR_FAIL_NULL_V(parent, ERR_...
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 16a7578d8acd..2f960beccac9 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -3437,7 +3437,7 @@ Error EditorFileSystem::make_dir_recursive(const String &p_path, const String &p ERR_FAIL_NULL_V(parent, ERR_...
[ "+\tconst PackedStringArray folders = p_path.trim_prefix(path).split(\"/\", false);" ]
[ 9 ]
{ "additions": 8, "author": "precup", "deletions": 2, "html_url": "https://github.com/godotengine/godot/pull/104022", "issue_id": 104022, "merged_at": "2025-03-19T11:37:52Z", "omission_probability": 0.1, "pr_number": 104022, "repo": "godotengine/godot", "title": "Defend against directories without t...
709
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index c145ddc6aa09..27afd864adb4 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -236,15 +236,15 @@ void Window::_get_property_list(List<PropertyInfo> *p_list) const { } void Window::_validate_property(PropertyInfo &p_property) const { - i...
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index c145ddc6aa09..27afd864adb4 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -236,15 +236,15 @@ void Window::_get_property_list(List<PropertyInfo> *p_list) const { } void Window::_validate_property(PropertyInfo &p_property) const { - if ...
[ "-\tif (p_property.name == \"theme_type_variation\") {", "+\t\tif (initial_position != WINDOW_INITIAL_POSITION_ABSOLUTE) {", "+\t} else if (p_property.name == \"theme_type_variation\") {" ]
[ 16, 18, 25 ]
{ "additions": 9, "author": "KoBeWi", "deletions": 9, "html_url": "https://github.com/godotengine/godot/pull/105730", "issue_id": 105730, "merged_at": "2025-04-24T22:23:36Z", "omission_probability": 0.1, "pr_number": 105730, "repo": "godotengine/godot", "title": "Improve Window's `_validate_property...
710
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 0c1d2f40a0dd..2b415c923d91 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -4105,7 +4105,7 @@ void Animation::clear() { emit_changed(); } -bool Animation::_float_track_optimize_key(const TKey<float> t...
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 0c1d2f40a0dd..2b415c923d91 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -4105,7 +4105,7 @@ void Animation::clear() { emit_changed(); -bool Animation::_float_track_optimize_key(const TKey<float> t0, co...
[ "-\t\t\t\terase = _float_track_optimize_key(t0, t1, t2, p_allowed_velocity_err, p_allowed_precision_error);", "+\t\t\t\terase = _float_track_optimize_key(t0, t1, t2, p_allowed_velocity_err, p_allowed_precision_error, is_nearest);", "+\tbool _float_track_optimize_key(const TKey<float> t0, const TKey<float> t1, c...
[ 190, 191, 234 ]
{ "additions": 59, "author": "lazarosY", "deletions": 23, "html_url": "https://github.com/godotengine/godot/pull/105644", "issue_id": 105644, "merged_at": "2025-04-24T22:23:37Z", "omission_probability": 0.1, "pr_number": 105644, "repo": "godotengine/godot", "title": "Fix the Animation Optimization r...
711
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 565a97342571..6c0d24a2b000 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -422,6 +422,7 @@ void ProjectSettings::_get_property_list(List<PropertyInfo> *p_list) const { _THREAD_SAFE_METHOD_ ...
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index 565a97342571..6c0d24a2b000 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -422,6 +422,7 @@ void ProjectSettings::_get_property_list(List<PropertyInfo> *p_list) const { _THREAD_SAFE_METHOD_ ...
[ "+\t\t\tif (props.has(n)) { // Property is an override.", "+\t\tif (setting_overrides.has(base.name)) {" ]
[ 27, 52 ]
{ "additions": 31, "author": "dugramen", "deletions": 12, "html_url": "https://github.com/godotengine/godot/pull/103336", "issue_id": 103336, "merged_at": "2025-04-24T22:23:37Z", "omission_probability": 0.1, "pr_number": 103336, "repo": "godotengine/godot", "title": "Keep ProjectSettings overrides r...
712
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 95e3d4a553d1..384284b6047e 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -30,7 +30,7 @@ jobs: # Skip debug symbols, they're way too big with MSVC. sc...
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 95e3d4a553d1..384284b6047e 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -30,7 +30,7 @@ jobs: # Skip debug symbols, they're way too big with MSVC. sc...
[ "+ sconsflags: debug_symbols=no use_mingw=yes", "- version: tags/chromium/6029", "- file: Windows.6029-1.MSVC_17.x86_64.x86_32.zip" ]
[ 33, 43, 44 ]
{ "additions": 39, "author": "Repiteo", "deletions": 12, "html_url": "https://github.com/godotengine/godot/pull/97446", "issue_id": 97446, "merged_at": "2024-10-10T23:24:19Z", "omission_probability": 0.1, "pr_number": 97446, "repo": "godotengine/godot", "title": "CI: Add MinGW/GCC build to Windows G...
713
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 0b9e21e7b317..d8a8ea01f423 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -50,13 +50,13 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) { accept_event(); if (b->get_button_index() == MouseButton::WHEEL_D...
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 0b9e21e7b317..d8a8ea01f423 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -50,13 +50,13 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) { accept_event(); if (b->get_button_index() == MouseButton::WHEEL_DOW...
[ "+" ]
[ 29 ]
{ "additions": 18, "author": "tehKaiN", "deletions": 16, "html_url": "https://github.com/godotengine/godot/pull/105516", "issue_id": 105516, "merged_at": "2025-04-24T14:14:24Z", "omission_probability": 0.1, "pr_number": 105516, "repo": "godotengine/godot", "title": "Unify ScrollBar/ScrollContainer s...
714
diff --git a/platform/android/SCsub b/platform/android/SCsub index ca0747b5368c..14a648458393 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -1,6 +1,7 @@ #!/usr/bin/env python from misc.utility.scons_hints import * +import platform import subprocess import sys @@ -51,18 +52,34 @@ lib = env_...
diff --git a/platform/android/SCsub b/platform/android/SCsub index ca0747b5368c..14a648458393 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -1,6 +1,7 @@ #!/usr/bin/env python from misc.utility.scons_hints import * +import platform import subprocess import sys @@ -51,18 +52,34 @@ lib = env_andr...
[ "+ triple_target_dir = \"x86_64-linux-android\"", "+ host_subpath = \"windows\"", "- str(env[\"ANDROID_NDK_ROOT\"]) + \"/sources/cxx-stl/llvm-libc++/libs/\" + lib_arch_dir + \"/libc++_shared.so\"", "- \"--quiet\",", "+ if env[\"target\"] == \"editor\":" ]
[ 28, 42, 53, 65, 67 ]
{ "additions": 36, "author": "m4gr3d", "deletions": 12, "html_url": "https://github.com/godotengine/godot/pull/105611", "issue_id": 105611, "merged_at": "2025-04-24T14:14:24Z", "omission_probability": 0.1, "pr_number": 105611, "repo": "godotengine/godot", "title": "Update the Android NDK to the late...
715
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index bc55603a1941..9c0b2f5477db 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -5197,24 +5197,29 @@ void GDScriptAnalyzer::reduce_unary_op(GDScriptParser::UnaryOpNode *p_una...
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index bc55603a1941..9c0b2f5477db 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -5197,24 +5197,29 @@ void GDScriptAnalyzer::reduce_unary_op(GDScriptParser::UnaryOpNode *p_una...
[ "-\t\treturn value;", "+\t\tcase GDScriptParser::Node::CALL:", "+\t\t\ttype = Variant::ARRAY;", "+\t\t\tpush_error(vformat(R\"(Failed to construct \"%s\".)\", Variant::get_type_name(type)), p_call);", "+\t\t\tArray array = result;", "+func test():", "+\ttest_value(A3)", "+\ttest_value(a5)" ]
[ 11, 35, 53, 77, 82, 149, 153, 171 ]
{ "additions": 157, "author": "dalexeev", "deletions": 11, "html_url": "https://github.com/godotengine/godot/pull/78837", "issue_id": 78837, "merged_at": "2025-04-24T14:14:25Z", "omission_probability": 0.1, "pr_number": 78837, "repo": "godotengine/godot", "title": "GDScript: Add constant `Array` and...
716
diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index 17f0b9bef56c..61a785066c56 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp @@ -1130,12 +1130,14 @@ v...
diff --git a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp index 17f0b9bef56c..61a785066c56 100644 --- a/editor/debugger/debug_adapter/debug_adapter_protocol.cpp +++ b/editor/debugger/debug_adapter/debug_adapter_protocol.cpp @@ -1130,12 +1130,14 @@ v...
[]
[]
{ "additions": 7, "author": "YeldhamDev", "deletions": 5, "html_url": "https://github.com/godotengine/godot/pull/104842", "issue_id": 104842, "merged_at": "2025-04-24T14:14:24Z", "omission_probability": 0.1, "pr_number": 104842, "repo": "godotengine/godot", "title": "Fix remote object inspector thro...
717
diff --git a/thirdparty/jolt_physics/Jolt/Core/Memory.h b/thirdparty/jolt_physics/Jolt/Core/Memory.h index b5f318db1cfb..4f3dbc7d1326 100644 --- a/thirdparty/jolt_physics/Jolt/Core/Memory.h +++ b/thirdparty/jolt_physics/Jolt/Core/Memory.h @@ -27,12 +27,24 @@ JPH_EXPORT extern AlignedFreeFunction AlignedFree; /// Regis...
diff --git a/thirdparty/jolt_physics/Jolt/Core/Memory.h b/thirdparty/jolt_physics/Jolt/Core/Memory.h index b5f318db1cfb..4f3dbc7d1326 100644 --- a/thirdparty/jolt_physics/Jolt/Core/Memory.h +++ b/thirdparty/jolt_physics/Jolt/Core/Memory.h @@ -27,12 +27,24 @@ JPH_EXPORT extern AlignedFreeFunction AlignedFree; /// Regis...
[ "+\t#define JPH_INTERNAL_DEFAULT_FREE(pointer) JPH::Free(pointer)" ]
[ 17 ]
{ "additions": 16, "author": "jrouwe", "deletions": 4, "html_url": "https://github.com/godotengine/godot/pull/105696", "issue_id": 105696, "merged_at": "2025-04-24T14:14:24Z", "omission_probability": 0.1, "pr_number": 105696, "repo": "godotengine/godot", "title": "Jolt: 32-bit MinGW g++ doesn't call...
718
diff --git a/main/main.cpp b/main/main.cpp index 487addc344be..f0a48d8d39e6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -3348,14 +3348,6 @@ Error Main::setup2(bool p_show_boot_logo) { rendering_server->set_print_gpu_profile(true); } - if (Engine::get_singleton()->get_write_movie_path() != String()) { - ...
diff --git a/main/main.cpp b/main/main.cpp index 487addc344be..f0a48d8d39e6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -3348,14 +3348,6 @@ Error Main::setup2(bool p_show_boot_logo) { rendering_server->set_print_gpu_profile(true); } - if (movie_writer == nullptr) { - ERR_PRINT("Can't find movie writer...
[ "-\t\tif (Engine::get_singleton()->get_write_movie_path() != String()) {", "-\t\t\tmovie_writer = MovieWriter::find_writer_for_file(Engine::get_singleton()->get_write_movie_path());", "+\t\t\tif (movie_writer == nullptr) {" ]
[ 8, 9, 28 ]
{ "additions": 10, "author": "mobile-bungalow", "deletions": 8, "html_url": "https://github.com/godotengine/godot/pull/96134", "issue_id": 96134, "merged_at": "2025-04-24T14:14:25Z", "omission_probability": 0.1, "pr_number": 96134, "repo": "godotengine/godot", "title": "`MovieWriter` extension suppo...
719
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 05715749aafe..69dc6d698b52 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -294,7 +294,7 @@ <return type="PackedStringArray" /> <description> On Android devices: Returns the list of dangerous permissions that have been granted. - On ...
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 05715749aafe..69dc6d698b52 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -294,7 +294,7 @@ <return type="PackedStringArray" /> <description> On Android devices: Returns the list of dangerous permissions that have been granted. - On ...
[ "+\t\t\t\t- [code]OS.request_permission(\"macos.permission.RECORD_SCREEN\")[/code]", "+\tvirtual bool request_permission(const String &p_name) override;", "+\t\tret.push_back(\"macos.permission.RECORD_SCREEN\");", "+\tperm_hb->add_child(perm_link);", "+\tOS::get_singleton()->request_permission(\"macos.permi...
[ 19, 33, 71, 116, 123 ]
{ "additions": 60, "author": "bruvzg", "deletions": 3, "html_url": "https://github.com/godotengine/godot/pull/105507", "issue_id": 105507, "merged_at": "2025-04-24T14:14:24Z", "omission_probability": 0.1, "pr_number": 105507, "repo": "godotengine/godot", "title": "[ColorPicker, macOS] Add link to re...
720
diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index 9b6717c693de..3e537ae18097 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -260,7 +260,6 @@ int64_t AStar3D::get_point_capacity() const { void AStar3D::reserve_space(int64_t p_num_nodes) { ERR_FAIL_COND_MSG(p_num_nodes <= 0, vformat("Ne...
diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index 9b6717c693de..3e537ae18097 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -260,7 +260,6 @@ int64_t AStar3D::get_point_capacity() const { void AStar3D::reserve_space(int64_t p_num_nodes) { ERR_FAIL_COND_MSG(p_num_nodes <= 0, vformat("New ...
[ "+\tERR_FAIL_COND_V_MSG(p_size < length(), *this, \"reserve() called with a capacity smaller than the current size. This is likely a mistake.\");", "-\t\tERR_FAIL_COND_MSG(p_new_capacity < get_capacity(), \"It is impossible to reserve less capacity than is currently available.\");", "+\t\tERR_FAIL_COND_MSG(p_si...
[ 21, 34, 112 ]
{ "additions": 16, "author": "Ivorforce", "deletions": 13, "html_url": "https://github.com/godotengine/godot/pull/105278", "issue_id": 105278, "merged_at": "2025-04-23T17:11:45Z", "omission_probability": 0.1, "pr_number": 105278, "repo": "godotengine/godot", "title": "Smoke test: Log an error if `re...
721
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 869faa981eee..42b6c3c1f460 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -1274,44 +1274,39 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem } } - if (path_remaps.has(new...
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 869faa981eee..42b6c3c1f460 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -1274,44 +1274,39 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem - if (path_remaps.has(new_path)) { -...
[ "-\t\t\tif (f.is_valid()) {", "-\t\t\t\tString error_text;", "+\t// Usually, there's no remap file and FileAccess::exists() is faster than FileAccess::open().", "+\tnew_path = ResourceUID::ensure_path(new_path);", "+\t\tRef<FileAccess> f = FileAccess::open(new_path + \".remap\", FileAccess::READ, &err);", ...
[ 17, 26, 39, 40, 43, 59, 62, 85, 86, 87, 90, 96, 100 ]
{ "additions": 46, "author": "RedMser", "deletions": 86, "html_url": "https://github.com/godotengine/godot/pull/91594", "issue_id": 91594, "merged_at": "2025-04-23T17:11:45Z", "omission_probability": 0.1, "pr_number": 91594, "repo": "godotengine/godot", "title": "Remove old path remaps system", "t...
722
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index e5737df2ae5f..b54a821cd809 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -723,7 +723,7 @@ Vector<String> OS_Windows::get_video_adapter_driver_info() const { BSTR object_name = SysAllocString(...
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index e5737df2ae5f..b54a821cd809 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -723,7 +723,7 @@ Vector<String> OS_Windows::get_video_adapter_driver_info() const { BSTR object_name = SysAllocString(...
[]
[]
{ "additions": 7, "author": "jss2a98aj", "deletions": 3, "html_url": "https://github.com/godotengine/godot/pull/105548", "issue_id": 105548, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105548, "repo": "godotengine/godot", "title": "Ensure `VARIANT` instances are ac...
723
diff --git a/platform/android/SCsub b/platform/android/SCsub index 72d36eabfc6f..ca0747b5368c 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -86,7 +86,7 @@ if lib_arch_dir != "": ) env_android.CommandNoCache(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE")) - d...
diff --git a/platform/android/SCsub b/platform/android/SCsub index 72d36eabfc6f..ca0747b5368c 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -86,7 +86,7 @@ if lib_arch_dir != "": ) env_android.CommandNoCache(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE")) - def...
[ "- env_android.AlwaysBuild(env_android.CommandNoCache(\"generate_apk\", lib, env.Run(generate_apk)))", "+ from(\"editor/build/outputs/native-debug-symbols/${androidDistro}${capitalizedTarget}\") {", "-task generateDevTemplate {" ]
[ 27, 92, 108 ]
{ "additions": 35, "author": "m4gr3d", "deletions": 22, "html_url": "https://github.com/godotengine/godot/pull/105605", "issue_id": 105605, "merged_at": "2025-04-22T23:28:42Z", "omission_probability": 0.1, "pr_number": 105605, "repo": "godotengine/godot", "title": "Android: Enable native debug symbo...
724
diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 81caa5d14741..b82af8682ae9 100644 --- a/core/variant/array.cpp +++ b/core/variant/array.cpp @@ -801,47 +801,45 @@ Variant Array::pop_at(int p_pos) { } Variant Array::min() const { - Variant minval; - for (int i = 0; i < size(); i++) { - if (i == 0)...
diff --git a/core/variant/array.cpp b/core/variant/array.cpp index 81caa5d14741..b82af8682ae9 100644 --- a/core/variant/array.cpp +++ b/core/variant/array.cpp @@ -801,47 +801,45 @@ Variant Array::pop_at(int p_pos) { Variant Array::min() const { - Variant minval; - minval = get(i); - Variant::evaluate(Variant::OP_L...
[ "-\t\t\t\tminval = test;" ]
[ 22 ]
{ "additions": 32, "author": "aaronp64", "deletions": 34, "html_url": "https://github.com/godotengine/godot/pull/105392", "issue_id": 105392, "merged_at": "2025-04-15T17:33:20Z", "omission_probability": 0.1, "pr_number": 105392, "repo": "godotengine/godot", "title": "Optimize `Array` `min`/`max` met...
725
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index e4cc0f9c03b1..07e00b099a8e 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1612,6 +1612,7 @@ ProjectSettings::ProjectSettings() { GLOBAL_DEF_BASIC("input_devices/pointing/android/enable_long...
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index e4cc0f9c03b1..07e00b099a8e 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -1612,6 +1612,7 @@ ProjectSettings::ProjectSettings() { GLOBAL_DEF_BASIC("input_devices/pointing/android/enable_long...
[ "+\t\tval overrideVolumeButtonsEnabled = overrideVolumeButtons()" ]
[ 34 ]
{ "additions": 25, "author": "syntaxerror247", "deletions": 8, "html_url": "https://github.com/godotengine/godot/pull/102984", "issue_id": 102984, "merged_at": "2025-03-11T14:42:27Z", "omission_probability": 0.1, "pr_number": 102984, "repo": "godotengine/godot", "title": "Android: enable support for...
726
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 546dae618387..e52fa217701c 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -551,6 +551,9 @@ void GridMapEditor::_fill_selecti...
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 546dae618387..e52fa217701c 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -551,6 +551,9 @@ void GridMapEditor::_fill_selecti...
[ "+\t\t\t\tif (mesh.is_valid()) {" ]
[ 18 ]
{ "additions": 10, "author": "smix8", "deletions": 0, "html_url": "https://github.com/godotengine/godot/pull/105664", "issue_id": 105664, "merged_at": "2025-04-22T23:28:42Z", "omission_probability": 0.1, "pr_number": 105664, "repo": "godotengine/godot", "title": "Fix GridMap move selection crashing ...
727
diff --git a/misc/msvs/nmake.substitution.props b/misc/msvs/nmake.substitution.props index 05a155eb9ebc..3f94fc4c1e7e 100644 --- a/misc/msvs/nmake.substitution.props +++ b/misc/msvs/nmake.substitution.props @@ -16,4 +16,23 @@ <Target Name="Clean"> <Exec Command="$(NMakeCleanCommandLine)"/> </Target> + <Item...
diff --git a/misc/msvs/nmake.substitution.props b/misc/msvs/nmake.substitution.props index 05a155eb9ebc..3f94fc4c1e7e 100644 --- a/misc/msvs/nmake.substitution.props +++ b/misc/msvs/nmake.substitution.props @@ -16,4 +16,23 @@ <Target Name="Clean"> <Exec Command="$(NMakeCleanCommandLine)"/> </Target> + <Item...
[ "+ </ClCompile>" ]
[ 14 ]
{ "additions": 19, "author": "van800", "deletions": 0, "html_url": "https://github.com/godotengine/godot/pull/105650", "issue_id": 105650, "merged_at": "2025-04-22T23:28:42Z", "omission_probability": 0.1, "pr_number": 105650, "repo": "godotengine/godot", "title": "Fixes for `.sln` project generation...
728
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 4cde5a9646e6..4a5969727d95 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -562,6 +562,8 @@ void GridMapEditor::_set_clipboar...
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 4cde5a9646e6..4a5969727d95 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -562,6 +562,8 @@ void GridMapEditor::_set_clipboar...
[ "-\t\t\tcursor_instance = RenderingServer::get_singleton()->instance_create2(cursor_mesh, get_tree()->get_root()->get_world_3d()->get_scenario());", "-\t\t\t\tRS::get_singleton()->instance_set_scenario(bm.instance, get_world_3d()->get_scenario());", "+\t\t\t\tRS::get_singleton()->instance_set_scenario(instance,...
[ 39, 102, 149 ]
{ "additions": 43, "author": "smix8", "deletions": 17, "html_url": "https://github.com/godotengine/godot/pull/105563", "issue_id": 105563, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105563, "repo": "godotengine/godot", "title": "Optimize GridMap rendering scenario...
729
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index ff52a67dbc7c..f5fcc2aa8a40 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -354,10 +354,7 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) { key.y = p_position.y; key.z = p...
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index ff52a67dbc7c..f5fcc2aa8a40 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -354,10 +354,7 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) { key.y = p_position.y; key.z = p...
[ "-\t\tok.y = key.y / octant_size;" ]
[ 55 ]
{ "additions": 31, "author": "smix8", "deletions": 8, "html_url": "https://github.com/godotengine/godot/pull/105329", "issue_id": 105329, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105329, "repo": "godotengine/godot", "title": "Fix GridMap OctantKey cell rasteriza...
730
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 4cde5a9646e6..1ec33b42f36a 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -813,8 +813,8 @@ EditorPlugin::AfterGUIInput GridM...
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 4cde5a9646e6..1ec33b42f36a 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -813,8 +813,8 @@ EditorPlugin::AfterGUIInput GridM...
[ "+\t\t\tfor (const MultiMeshItemPlacement &mm_item_placement : mm_item_placements) {", "-\tList<OctantKey> to_delete;" ]
[ 117, 134 ]
{ "additions": 32, "author": "smix8", "deletions": 22, "html_url": "https://github.com/godotengine/godot/pull/105565", "issue_id": 105565, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105565, "repo": "godotengine/godot", "title": "Replace GridMap legacy use of `List...
731
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index 3dd8bbed8821..bbdf03612c3b 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -79,7 +79,7 @@ def templateExcludedBuildTask() { // We exclude these gradle tasks so we can run the scons...
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index 3dd8bbed8821..bbdf03612c3b 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -79,7 +79,7 @@ def templateExcludedBuildTask() { // We exclude these gradle tasks so we can run the scons...
[ "+ url = 'https://github.com/godotengine/godot/blob/master/LICENSE.txt'", "+ id = 'm4gr3d'", "+ connection = 'scm:git:github.com/godotengine/godot.git'", "+ developerConnection = 'scm:git:ssh://github.com/godot...
[ 58, 63, 83, 84, 85, 87, 94 ]
{ "additions": 56, "author": "m4gr3d", "deletions": 3, "html_url": "https://github.com/godotengine/godot/pull/104819", "issue_id": 104819, "merged_at": "2025-04-16T15:49:51Z", "omission_probability": 0.1, "pr_number": 104819, "repo": "godotengine/godot", "title": "Add maven publishing configuration ...
732
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index db5113fa7035..cf9f8080b362 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -42,8 +42,6 @@ #include "scene/gui/check_button.h" #include "servers/movie_writer/movie_writer.h" -Project...
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index db5113fa7035..cf9f8080b362 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -42,8 +42,6 @@ #include "scene/gui/check_button.h" #include "servers/movie_writer/movie_writer.h" void Proj...
[ "-ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr;", "-\t}", "+\t\t}" ]
[ 8, 64, 70 ]
{ "additions": 38, "author": "KoBeWi", "deletions": 20, "html_url": "https://github.com/godotengine/godot/pull/105307", "issue_id": 105307, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105307, "repo": "godotengine/godot", "title": "Support custom features in project...
733
diff --git a/scene/gui/color_mode.cpp b/scene/gui/color_mode.cpp index 5f58a16d50fe..ccf2d03caa3a 100644 --- a/scene/gui/color_mode.cpp +++ b/scene/gui/color_mode.cpp @@ -43,12 +43,6 @@ String ColorModeRGB::get_slider_label(int idx) const { return labels[idx]; } -float ColorModeRGB::get_slider_max(int idx) const {...
diff --git a/scene/gui/color_mode.cpp b/scene/gui/color_mode.cpp index 5f58a16d50fe..ccf2d03caa3a 100644 --- a/scene/gui/color_mode.cpp +++ b/scene/gui/color_mode.cpp @@ -43,12 +43,6 @@ String ColorModeRGB::get_slider_label(int idx) const { return labels[idx]; } -float ColorModeRGB::get_slider_max(int idx) const { -...
[ "-\t\t\tvalues[i]->set_custom_arrow_step(spinbox_arrow_step);" ]
[ 55 ]
{ "additions": 6, "author": "KoBeWi", "deletions": 8, "html_url": "https://github.com/godotengine/godot/pull/102240", "issue_id": 102240, "merged_at": "2025-04-22T15:46:13Z", "omission_probability": 0.1, "pr_number": 102240, "repo": "godotengine/godot", "title": "Fix ColorPicker sliders in overbrigh...
734
diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h index 3ff34c407e4b..f87134092484 100644 --- a/core/templates/rid_owner.h +++ b/core/templates/rid_owner.h @@ -33,7 +33,7 @@ #include "core/os/memory.h" #include "core/os/mutex.h" #include "core/string/print_string.h" -#include "core/templates/list....
diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h index 3ff34c407e4b..f87134092484 100644 --- a/core/templates/rid_owner.h +++ b/core/templates/rid_owner.h @@ -33,7 +33,7 @@ #include "core/os/memory.h" #include "core/string/print_string.h" -#include "core/templates/list.h" +#include "core/templates...
[ "+\tLocalVector<RID> get_owned_list() const {", "-\t\t\t\tp_owned->push_back(_make_from_id((validator << 32) | i));", "+#include <cstdint>", "-\t\tVersion *version = version_owner.get_or_null(E);", "-\t\ttexture_owner.get_owned_list(&owned);", "-\t\t\t\tfree(E);", "-\tList<RID> compositor_rids;" ]
[ 18, 26, 104, 305, 380, 420, 433 ]
{ "additions": 74, "author": "YYF233333", "deletions": 102, "html_url": "https://github.com/godotengine/godot/pull/104738", "issue_id": 104738, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 104738, "repo": "godotengine/godot", "title": "Use `LocalVector` in `RID_Owne...
735
diff --git a/modules/openxr/editor/openxr_action_set_editor.cpp b/modules/openxr/editor/openxr_action_set_editor.cpp index 06c5d48d159e..f205c8fc4b33 100644 --- a/modules/openxr/editor/openxr_action_set_editor.cpp +++ b/modules/openxr/editor/openxr_action_set_editor.cpp @@ -31,8 +31,14 @@ #include "openxr_action_set_e...
diff --git a/modules/openxr/editor/openxr_action_set_editor.cpp b/modules/openxr/editor/openxr_action_set_editor.cpp index 06c5d48d159e..f205c8fc4b33 100644 --- a/modules/openxr/editor/openxr_action_set_editor.cpp +++ b/modules/openxr/editor/openxr_action_set_editor.cpp @@ -31,8 +31,14 @@ #include "openxr_action_set_e...
[ "-\taction_set_priority = memnew(TextEdit);", "-#include \"scene/gui/line_edit.h\"", "+\tvoid _on_action_set_priority_changed(const double p_new_value);" ]
[ 43, 68, 94 ]
{ "additions": 24, "author": "lodetrick", "deletions": 14, "html_url": "https://github.com/godotengine/godot/pull/104461", "issue_id": 104461, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 104461, "repo": "godotengine/godot", "title": "Editor: Replace TextEdit with E...
736
diff --git a/SConstruct b/SConstruct index 03990864310e..bcc2094f0541 100644 --- a/SConstruct +++ b/SConstruct @@ -296,6 +296,9 @@ opts.Add("asflags", "Custom flags for the assembler") opts.Add("arflags", "Custom flags for the archive tool") opts.Add("rcflags", "Custom flags for Windows resource compiler") +opts.Ad...
diff --git a/SConstruct b/SConstruct index 03990864310e..bcc2094f0541 100644 --- a/SConstruct +++ b/SConstruct @@ -296,6 +296,9 @@ opts.Add("asflags", "Custom flags for the assembler") opts.Add("arflags", "Custom flags for the archive tool") opts.Add("rcflags", "Custom flags for Windows resource compiler") +opts.Add(...
[]
[]
{ "additions": 10, "author": "adamscott", "deletions": 0, "html_url": "https://github.com/godotengine/godot/pull/105498", "issue_id": 105498, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105498, "repo": "godotengine/godot", "title": "Add `{c,cpp}_compiler_launcher` ...
737
diff --git a/.clang-format b/.clang-format index 6a547cf6f118..87731d9eb833 100644 --- a/.clang-format +++ b/.clang-format @@ -52,8 +52,10 @@ AllowShortFunctionsOnASingleLine: Inline # AlwaysBreakAfterReturnType: None # AlwaysBreakBeforeMultilineStrings: false # AlwaysBreakTemplateDeclarations: MultiLine -# Attribut...
diff --git a/.clang-format b/.clang-format index 6a547cf6f118..87731d9eb833 100644 --- a/.clang-format +++ b/.clang-format @@ -52,8 +52,10 @@ AllowShortFunctionsOnASingleLine: Inline # AlwaysBreakAfterReturnType: None # AlwaysBreakBeforeMultilineStrings: false # AlwaysBreakTemplateDeclarations: MultiLine -# Attribut...
[ "+_FORCE_INLINE_ void *owned(id p_id) {", "+_FORCE_INLINE_ auto release(RDD::ID p_id) {" ]
[ 27, 44 ]
{ "additions": 16, "author": "Repiteo", "deletions": 15, "html_url": "https://github.com/godotengine/godot/pull/105531", "issue_id": 105531, "merged_at": "2025-04-22T15:46:12Z", "omission_probability": 0.1, "pr_number": 105531, "repo": "godotengine/godot", "title": "Style: Declare inline macros as a...
738
diff --git a/editor/gui/touch_actions_panel.cpp b/editor/gui/touch_actions_panel.cpp index bc6576e519e9..5e6822adb192 100644 --- a/editor/gui/touch_actions_panel.cpp +++ b/editor/gui/touch_actions_panel.cpp @@ -45,6 +45,9 @@ void TouchActionsPanel::_notification(int p_what) { DisplayServer::get_singleton()->set_har...
diff --git a/editor/gui/touch_actions_panel.cpp b/editor/gui/touch_actions_panel.cpp index bc6576e519e9..5e6822adb192 100644 --- a/editor/gui/touch_actions_panel.cpp +++ b/editor/gui/touch_actions_panel.cpp @@ -45,6 +45,9 @@ void TouchActionsPanel::_notification(int p_what) { DisplayServer::get_singleton()->set_har...
[ "+\ttoggle_button->connect(SceneStringName(toggled), callable_mp(this, &TouchActionsPanel::_on_modifier_button_toggled).bind((int)p_modifier));", "+\t\t\t}", "+\tqueue_redraw();", "-\tlock_panel_button->set_focus_mode(Control::FOCUS_NONE);", "+\tlock_panel_button->set_icon_alignment(HORIZONTAL_ALIGNMENT_CEN...
[ 95, 111, 119, 158, 162, 183, 194, 205, 223 ]
{ "additions": 105, "author": "syntaxerror247", "deletions": 16, "html_url": "https://github.com/godotengine/godot/pull/105140", "issue_id": 105140, "merged_at": "2025-04-15T17:33:20Z", "omission_probability": 0.1, "pr_number": 105140, "repo": "godotengine/godot", "title": "Android Editor: Add new a...
739
diff --git a/ext/random/random.stub.php b/ext/random/random.stub.php index fc3b178e55fff..b59221bf9180f 100644 --- a/ext/random/random.stub.php +++ b/ext/random/random.stub.php @@ -27,9 +27,13 @@ function rand(int $min = UNKNOWN, int $max = UNKNOWN): int {} function mt_rand(int $min = UNKNOWN, int $max = UNKNOWN...
diff --git a/ext/random/random.stub.php b/ext/random/random.stub.php index fc3b178e55fff..b59221bf9180f 100644 --- a/ext/random/random.stub.php +++ b/ext/random/random.stub.php @@ -27,9 +27,13 @@ function rand(int $min = UNKNOWN, int $max = UNKNOWN): int {} function mt_rand(int $min = UNKNOWN, int $max = UNKNOWN):...
[]
[]
{ "additions": 8, "author": "TimWolla", "deletions": 4, "html_url": "https://github.com/php/php-src/pull/18425", "issue_id": 18425, "merged_at": "2025-04-25T20:57:04Z", "omission_probability": 0.1, "pr_number": 18425, "repo": "php/php-src", "title": "random: Mark `mt_getrandmax()` as `@compile-time-...
740
diff --git a/docs/release-process.md b/docs/release-process.md index 36963b4318ead..cbfa791db6ef5 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -73,7 +73,7 @@ releases. > When you are unsure about anything, ask a previous RM before proceeding. > Ideally, make sure a previous RM is availa...
diff --git a/docs/release-process.md b/docs/release-process.md index 36963b4318ead..cbfa791db6ef5 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -73,7 +73,7 @@ releases. > When you are unsure about anything, ask a previous RM before proceeding. > Ideally, make sure a previous RM is availa...
[ "- See [Announce PHP 8.1.6][] for an example commit.", "- see [PHP 8.1.6 released][].", "+ git add archive/entries/*.xml releases/*.php", "-2. Subscribe to the php-announce@lists.php.net mailing list by emailing", "- * https://github.com/php/web-qa" ]
[ 49, 62, 71, 105, 140 ]
{ "additions": 21, "author": "saundefined", "deletions": 36, "html_url": "https://github.com/php/php-src/pull/18342", "issue_id": 18342, "merged_at": "2025-04-24T15:53:11Z", "omission_probability": 0.1, "pr_number": 18342, "repo": "php/php-src", "title": "Update release process", "total_changes": ...
741
diff --git a/ext/fileinfo/tests/bug79756.phpt b/ext/fileinfo/tests/bug79756.phpt index b4ea28baaa9b..ad5478b62de8 100644 --- a/ext/fileinfo/tests/bug79756.phpt +++ b/ext/fileinfo/tests/bug79756.phpt @@ -7,7 +7,6 @@ fileinfo $filename = __DIR__ . '/bug79756.xls'; $finfo = finfo_open(FILEINFO_MIME); $mime = finfo_file...
diff --git a/ext/fileinfo/tests/bug79756.phpt b/ext/fileinfo/tests/bug79756.phpt index b4ea28baaa9b..ad5478b62de8 100644 --- a/ext/fileinfo/tests/bug79756.phpt +++ b/ext/fileinfo/tests/bug79756.phpt @@ -7,7 +7,6 @@ fileinfo $filename = __DIR__ . '/bug79756.xls'; $finfo = finfo_open(FILEINFO_MIME); $mime = finfo_file...
[]
[]
{ "additions": 0, "author": "TimWolla", "deletions": 15, "html_url": "https://github.com/php/php-src/pull/18405", "issue_id": 18405, "merged_at": "2025-04-23T16:57:33Z", "omission_probability": 0.1, "pr_number": 18405, "repo": "php/php-src", "title": "fileinfo: Stop calling `finfo_close()` in tests"...
742
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index c0cc8877bf99..1dcc3346edfc 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -36,17 +36,11 @@ #include "fopen_wrappers.h" /* needed for is_url */ #include "Zend/zend_exceptions.h" -/* {{{ macros and type definitions */ -typedef...
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index c0cc8877bf99..1dcc3346edfc 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -36,17 +36,11 @@ #include "fopen_wrappers.h" /* needed for is_url */ #include "Zend/zend_exceptions.h" -/* {{{ macros and type definitions */ -typedef s...
[ "-\t\tzend_throw_error(NULL, \"Invalid finfo object\"); \\", "-\t\tmagic_close(intern->ptr->magic);", "-\t\t}", "-\tfinfo->magic = magic_open(options);", "+\tmagic_setflags(Z_FINFO_P(self)->magic, options);", "+--EXTENSIONS--", "+<?php", "+$finfo = (new ReflectionClass('finfo'))->newInstanceWithoutCon...
[ 32, 43, 71, 85, 145, 234, 237, 239, 242, 260 ]
{ "additions": 91, "author": "TimWolla", "deletions": 55, "html_url": "https://github.com/php/php-src/pull/18398", "issue_id": 18398, "merged_at": "2025-04-23T10:04:11Z", "omission_probability": 0.1, "pr_number": 18398, "repo": "php/php-src", "title": "fileinfo: Remove `php_fileinfo` struct", "tot...
743
diff --git a/NEWS b/NEWS index bef0ac90460a..a3d278ac2e3b 100644 --- a/NEWS +++ b/NEWS @@ -88,6 +88,7 @@ PHP NEWS (BogdanUngureanu) . Added Locale::isRightToLeft to check if a locale is written right to left. (David Carlier) + . Added ...
diff --git a/NEWS b/NEWS index bef0ac90460a..a3d278ac2e3b 100644 --- a/NEWS +++ b/NEWS @@ -88,6 +88,7 @@ PHP NEWS (BogdanUngureanu) . Added Locale::isRightToLeft to check if a locale is written right to left. (David Carlier) + . Added ...
[ "+{", "+?>", "+\t ut_loc_get_display_script(\"a-DE\", \"locale=a\\0-DE\");", "+Locale::getRegion(): Argument #1 ($locale) must not contain any null bytes", "+Locale::lookup(): Argument #4 ($defaultLocale) must not contain any null bytes", "+ echo $e->getMessage(), PHP_EOL;" ]
[ 204, 219, 240, 280, 366, 384 ]
{ "additions": 142, "author": "devnexen", "deletions": 12, "html_url": "https://github.com/php/php-src/pull/18365", "issue_id": 18365, "merged_at": "2025-04-22T22:39:05Z", "omission_probability": 0.1, "pr_number": 18365, "repo": "php/php-src", "title": "ext/intl: Locale::* methods using param as pat...
744
diff --git a/NEWS b/NEWS index 47bf820d6b64..bef0ac90460a 100644 --- a/NEWS +++ b/NEWS @@ -69,6 +69,7 @@ PHP NEWS - Fileinfo: . Upgrade to file 5.46. (nielsdos) + . Change return type of finfo_close() to true. (timwolla) - FPM: . Fixed ...
diff --git a/NEWS b/NEWS index 47bf820d6b64..bef0ac90460a 100644 --- a/NEWS +++ b/NEWS @@ -69,6 +69,7 @@ PHP NEWS . Upgrade to file 5.46. (nielsdos) + . Change return type of finfo_close() to true. (timwolla) - FPM: . Fixed GH-17645 (FPM wit...
[ "- * Stub hash: 96d78126bc5af37c5d94fa160e509623e947de48 */" ]
[ 45 ]
{ "additions": 7, "author": "TimWolla", "deletions": 3, "html_url": "https://github.com/php/php-src/pull/18395", "issue_id": 18395, "merged_at": "2025-04-22T18:18:08Z", "omission_probability": 0.1, "pr_number": 18395, "repo": "php/php-src", "title": "fileinfo: Change return type of `finfo_close()` t...
745
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index c53bf8ed9a35c..745b247c66130 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -2186,17 +2186,18 @@ PHP_FUNCTION(pg_fetch_all_columns) RETURN_THROWS(); } - array_init(return_value); - if ((pg_numrows = PQntuples(pgsql_result)) <= 0) { - return; ...
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index c53bf8ed9a35c..745b247c66130 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -2186,17 +2186,18 @@ PHP_FUNCTION(pg_fetch_all_columns) RETURN_THROWS(); - array_init(return_value); - if ((pg_numrows = PQntuples(pgsql_result)) <= 0) { - return; + RET...
[ "-\t\t\tadd_next_index_null(return_value);", "+\t\t\tadd_index_string(return_value, pg_row, PQgetvalue(pgsql_result, pg_row, (int)colno));" ]
[ 20, 24 ]
{ "additions": 7, "author": "devnexen", "deletions": 5, "html_url": "https://github.com/php/php-src/pull/18374", "issue_id": 18374, "merged_at": "2025-04-21T12:43:44Z", "omission_probability": 0.1, "pr_number": 18374, "repo": "php/php-src", "title": "ext/pgsql: pg_fetch_all_columns/pg_copy_to arrays...
746
diff --git a/ext/posix/posix.c b/ext/posix/posix.c index d465e5230938a..68d47840c5e20 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -236,10 +236,11 @@ PHP_FUNCTION(posix_getgroups) RETURN_FALSE; } - array_init(return_value); + array_init_size(return_value, result); + zend_hash_real_init_packed(Z_ARRV...
diff --git a/ext/posix/posix.c b/ext/posix/posix.c index d465e5230938a..68d47840c5e20 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -236,10 +236,11 @@ PHP_FUNCTION(posix_getgroups) + array_init_size(return_value, result); for (i=0; i<result; i++) { + add_index_long(return_value, i, gidlist[i]); efree(g...
[ "+\tzend_hash_real_init_packed(Z_ARRVAL_P(return_value));", "-\t\tadd_next_index_long(return_value, gidlist[i]);", "-\t\tarray_init(return_value);" ]
[ 10, 13, 39 ]
{ "additions": 7, "author": "devnexen", "deletions": 4, "html_url": "https://github.com/php/php-src/pull/18370", "issue_id": 18370, "merged_at": "2025-04-20T22:23:43Z", "omission_probability": 0.1, "pr_number": 18370, "repo": "php/php-src", "title": "ext/posix: preallocate arrays and/or change to pa...
747
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index c993860f3b47..e993fb65f47d 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2438,7 +2438,7 @@ PHP_FUNCTION(imagecolorsforindex) col = index; if ((col >= 0 && gdImageTrueColor(im)) || (!gdImageTrueColor(im) && col >= 0 && col < gdImageColorsTotal(im))) { - array_init(ret...
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index c993860f3b47..e993fb65f47d 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2438,7 +2438,7 @@ PHP_FUNCTION(imagecolorsforindex) col = index; if ((col >= 0 && gdImageTrueColor(im)) || (!gdImageTrueColor(im) && col >= 0 && col < gdImageColorsTotal(im))) { + array_init_size(...
[ "-\tadd_next_index_long(return_value, x2);", "+\t\tzend_hash_real_init_packed(Z_ARRVAL_P(return_value));" ]
[ 20, 52 ]
{ "additions": 18, "author": "devnexen", "deletions": 13, "html_url": "https://github.com/php/php-src/pull/18366", "issue_id": 18366, "merged_at": "2025-04-20T16:30:12Z", "omission_probability": 0.1, "pr_number": 18366, "repo": "php/php-src", "title": "ext/gd: array supplied to user optimisations.",...
748
diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index c28ffb82cf737..75466aacb07af 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -469,7 +469,8 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) ZVAL_COPY_VALUE(&garbage, array); /* for res...
diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index c28ffb82cf737..75466aacb07af 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -469,7 +469,8 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) ZVAL_COPY_VALUE(&garbage, array); /* for resul...
[]
[]
{ "additions": 14, "author": "nielsdos", "deletions": 7, "html_url": "https://github.com/php/php-src/pull/18359", "issue_id": 18359, "merged_at": "2025-04-20T10:18:15Z", "omission_probability": 0.1, "pr_number": 18359, "repo": "php/php-src", "title": "Use pre-allocated array sizes and packed where p...
749
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 62ee83f62f9ba..cd4546ad7f8bb 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -57,6 +57,7 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS, UErrorCode status = U_ZERO_ERROR; UIDNA *uts46; int32_t len; + int32_t buffe...
diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 62ee83f62f9ba..cd4546ad7f8bb 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -57,6 +57,7 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS, UErrorCode status = U_ZERO_ERROR; UIDNA *uts46; int32_t len; + int32_t buffe...
[ "+" ]
[ 67 ]
{ "additions": 15, "author": "nielsdos", "deletions": 19, "html_url": "https://github.com/php/php-src/pull/18360", "issue_id": 18360, "merged_at": "2025-04-20T10:17:50Z", "omission_probability": 0.1, "pr_number": 18360, "repo": "php/php-src", "title": "Cleanup in intl/idn", "total_changes": 34 }
750
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index e292728de271..a0797967d1e7 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -189,9 +189,8 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter) /* {{{ */ objmap->nodetype != XML_NOTATION_NODE) { if (objm...
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index e292728de271..a0797967d1e7 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -189,9 +189,8 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter) /* {{{ */ HashTable *nodeht = Z_ARRVAL_P(&objmap->baseobj_zv);...
[]
[]
{ "additions": 5, "author": "nielsdos", "deletions": 9, "html_url": "https://github.com/php/php-src/pull/18354", "issue_id": 18354, "merged_at": "2025-04-19T15:59:48Z", "omission_probability": 0.1, "pr_number": 18354, "repo": "php/php-src", "title": "Get rid of separate DOM HashPosition member", "...
751
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 3a30b1458dea0..b8a23f87c663e 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -487,10 +487,6 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, } } if (ret == PASS) { - ZEND_ASSERT(conn->username.s != ...
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 3a30b1458dea0..b8a23f87c663e 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -487,10 +487,6 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, } if (ret == PASS) { - ZEND_ASSERT(conn->username.s != user ...
[ "+\t\t} else {", "-\t\t\tmysqlnd_set_persistent_string(&conn->hostname, hostname.s, hostname.l, conn->persistent);", "+\t\t\tif (!socket_or_pipe.s || !conn->host_info) {" ]
[ 52, 62, 89 ]
{ "additions": 4, "author": "kamil-tekiela", "deletions": 29, "html_url": "https://github.com/php/php-src/pull/18023", "issue_id": 18023, "merged_at": "2025-04-19T12:26:09Z", "omission_probability": 0.1, "pr_number": 18023, "repo": "php/php-src", "title": "Drop unused variables", "total_changes": ...
752
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 1df46cc050b01..ce3e8565ad200 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -118,7 +118,7 @@ PHPAPI int php_exec(int type, const char *cmd, zval *array, zval *return_value) php_stream *stream; size_t buflen, bufl = 0; #if PHP_SIGCHILD - vo...
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 1df46cc050b01..ce3e8565ad200 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -118,7 +118,7 @@ PHPAPI int php_exec(int type, const char *cmd, zval *array, zval *return_value) php_stream *stream; size_t buflen, bufl = 0; + void (*sig_handler)(...
[ "-\tvoid (*sig_handler)() = signal(SIGCHLD, SIG_DFL);", "-\tvoid (*sig_handler)() = NULL;", "+\tvoid (*sig_handler)(int) = NULL;", "-\t}", "+\t RETURN_FALSE;" ]
[ 8, 21, 22, 35, 42 ]
{ "additions": 7, "author": "devnexen", "deletions": 7, "html_url": "https://github.com/php/php-src/pull/18265", "issue_id": 18265, "merged_at": "2025-04-19T09:18:53Z", "omission_probability": 0.1, "pr_number": 18265, "repo": "php/php-src", "title": "Fix few build warnings.", "total_changes": 14 }
753
diff --git a/ext/standard/array.c b/ext/standard/array.c index 4ab3a690120b..cabb43d8a914 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6439,7 +6439,7 @@ PHP_FUNCTION(array_reduce) zval args[2]; zval *operand; zend_fcall_info fci; - zend_fcall_info_cache fci_cache = empty_fcall_info_cache; + ze...
diff --git a/ext/standard/array.c b/ext/standard/array.c index 4ab3a690120b..cabb43d8a914 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6439,7 +6439,7 @@ PHP_FUNCTION(array_reduce) zval args[2]; zval *operand; zval *initial = NULL; HashTable *htbl; @@ -6515,7 +6515,7 @@ PHP_FUNCTION(array_fil...
[]
[]
{ "additions": 8, "author": "nielsdos", "deletions": 8, "html_url": "https://github.com/php/php-src/pull/18273", "issue_id": 18273, "merged_at": "2025-04-15T21:08:13Z", "omission_probability": 0.1, "pr_number": 18273, "repo": "php/php-src", "title": "Avoid useless initializations of fci/fcc in array...
754
diff --git a/Zend/tests/oss_fuzz_410939023.phpt b/Zend/tests/oss_fuzz_410939023.phpt new file mode 100644 index 000000000000..9c024bf5b5b0 --- /dev/null +++ b/Zend/tests/oss_fuzz_410939023.phpt @@ -0,0 +1,11 @@ +--TEST-- +OSS-Fuzz #410939023: Use of magic const within const expr cast +--FILE-- +<?php + +const C = (stri...
diff --git a/Zend/tests/oss_fuzz_410939023.phpt b/Zend/tests/oss_fuzz_410939023.phpt new file mode 100644 index 000000000000..9c024bf5b5b0 --- /dev/null +++ b/Zend/tests/oss_fuzz_410939023.phpt @@ -0,0 +1,11 @@ +--TEST-- +OSS-Fuzz #410939023: Use of magic const within const expr cast +--FILE-- +<?php +const C = (string...
[ "+string(0) \"\"" ]
[ 16 ]
{ "additions": 14, "author": "iluuu1994", "deletions": 0, "html_url": "https://github.com/php/php-src/pull/18338", "issue_id": 18338, "merged_at": "2025-04-16T18:00:41Z", "omission_probability": 0.1, "pr_number": 18338, "repo": "php/php-src", "title": "Fix use of magic const within const expr cast",...
755
diff --git a/.gitignore b/.gitignore index 91120a5fa6b2..55c441323cf1 100644 --- a/.gitignore +++ b/.gitignore @@ -237,6 +237,7 @@ php **/tests/**/*.exp **/tests/**/*.log **/tests/**/*.sh +**/tests/**/*.stdin # Generated by some test cases **/tests/**/*.db diff --git a/run-tests.php b/run-tests.php index 0db6937...
diff --git a/.gitignore b/.gitignore index 91120a5fa6b2..55c441323cf1 100644 --- a/.gitignore +++ b/.gitignore @@ -237,6 +237,7 @@ php **/tests/**/*.exp **/tests/**/*.log **/tests/**/*.sh +**/tests/**/*.stdin # Generated by some test cases **/tests/**/*.db diff --git a/run-tests.php b/run-tests.php index 0db6937c7...
[ "+ : $test->getSection('PHPDBG') . \"\\n\";" ]
[ 40 ]
{ "additions": 13, "author": "arnaud-lb", "deletions": 0, "html_url": "https://github.com/php/php-src/pull/18305", "issue_id": 18305, "merged_at": "2025-04-15T12:02:08Z", "omission_probability": 0.1, "pr_number": 18305, "repo": "php/php-src", "title": "run-tests.php: Save STDIN section into a file",...
756
diff --git a/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt b/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt new file mode 100644 index 0000000000000..2ff7cfb0cb17b --- /dev/null +++ b/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt @@ -0,0 +1,46 @@ +--TEST-- +GH-18301: casting to void is allowed in for’s...
diff --git a/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt b/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt index 0000000000000..2ff7cfb0cb17b +++ b/Zend/tests/type_casts/gh18301_cast_to_void_for.phpt @@ -0,0 +1,46 @@ +GH-18301: casting to void is allowed in for’s expression lists +$count = 0; +#[NoDiscard] ...
[ "+\t$count++;", "+\t\t\topline->extended_value = ZEND_FREE_VOID_CAST;", "+\tzend_compile_for_expr_list(&result, cond_ast);", "-{" ]
[ 16, 87, 141, 150 ]
{ "additions": 96, "author": "TimWolla", "deletions": 27, "html_url": "https://github.com/php/php-src/pull/18303", "issue_id": 18303, "merged_at": "2025-04-14T13:36:52Z", "omission_probability": 0.1, "pr_number": 18303, "repo": "php/php-src", "title": "zend_compile: Allow `(void)` in for’s initializ...
757
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index b61d253c5d4be..157ee41a11a05 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -63,15 +63,15 @@ #define PHP_ICONV_IMPL_VALUE "unknown" #endif -static char *get_iconv_version(void) { - char *version = "unknown"; +static const char *get_iconv_version(vo...
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index b61d253c5d4be..157ee41a11a05 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -63,15 +63,15 @@ #define PHP_ICONV_IMPL_VALUE "unknown" -static char *get_iconv_version(void) { +static const char *get_iconv_version(void) { + const char *version = "unknown"...
[ "-\tchar *version = \"unknown\";", "-\tint output_status, mimetype_len = 0;" ]
[ 9, 37 ]
{ "additions": 22, "author": "Girgias", "deletions": 26, "html_url": "https://github.com/php/php-src/pull/18313", "issue_id": 18313, "merged_at": "2025-04-14T09:15:55Z", "omission_probability": 0.1, "pr_number": 18313, "repo": "php/php-src", "title": "ext/iconv: Various minor refactorings", "total...
758
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 461bdc1e901ec..751000fe63004 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1599,12 +1599,12 @@ PHP_METHOD(GlobIterator, count) RETURN_THROWS(); } - /* The spl_filesystem_object_get_method_check() function is called prio...
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 461bdc1e901ec..751000fe63004 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1599,12 +1599,12 @@ PHP_METHOD(GlobIterator, count) RETURN_THROWS(); } - /* The spl_filesystem_object_get_method_check() function is called prio...
[]
[]
{ "additions": 20, "author": "nielsdos", "deletions": 6, "html_url": "https://github.com/php/php-src/pull/18314", "issue_id": 18314, "merged_at": "2025-04-12T07:59:57Z", "omission_probability": 0.1, "pr_number": 18314, "repo": "php/php-src", "title": "Fix GlobIterator without constructor breaks coun...
759
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 962f839ba83f4..1e0e6d14d81eb 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -1164,7 +1164,7 @@ static zend_always_inline bcmath_number_obj_t *bcmath_number_new_obj(bc_num ret, return intern; } -static zend_result bcmath_number_parse_num(zv...
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 962f839ba83f4..1e0e6d14d81eb 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -1164,7 +1164,7 @@ static zend_always_inline bcmath_number_obj_t *bcmath_number_new_obj(bc_num ret, return intern; } -static zend_result bcmath_number_parse_num(zval...
[ "-\tchar *divisorptr = divisor->n_value;" ]
[ 67 ]
{ "additions": 13, "author": "SakiTakamachi", "deletions": 15, "html_url": "https://github.com/php/php-src/pull/18284", "issue_id": 18284, "merged_at": "2025-04-11T03:39:31Z", "omission_probability": 0.1, "pr_number": 18284, "repo": "php/php-src", "title": "ext/bcmath: Use `const` qualifiers appropr...
760
diff --git a/UPGRADING b/UPGRADING index 6cc0cc537df2d..451cfe4b86b3e 100644 --- a/UPGRADING +++ b/UPGRADING @@ -147,6 +147,11 @@ PHP 8.5 UPGRADE NOTES indicating the http and proxy authentication methods that were used in the previous request. See CURLAUTH_* constants for possible values. + . Added CUR...
diff --git a/UPGRADING b/UPGRADING index 6cc0cc537df2d..451cfe4b86b3e 100644 --- a/UPGRADING +++ b/UPGRADING @@ -147,6 +147,11 @@ PHP 8.5 UPGRADE NOTES indicating the http and proxy authentication methods that were used in the previous request. See CURLAUTH_* constants for possible values. + . Added CUR...
[ "+/**", "+--SKIPIF--", "+$f = fopen(__FILE__,\"r\");", "+ CURLOPT_INFILESIZE => filesize(__FILE__),", "+ CURLOPT_SSL_VERIFYPEER => 0,", "+]));" ]
[ 32, 97, 104, 109, 113, 114 ]
{ "additions": 77, "author": "OskarStark", "deletions": 1, "html_url": "https://github.com/php/php-src/pull/17637", "issue_id": 17637, "merged_at": "2025-04-09T07:12:14Z", "omission_probability": 0.1, "pr_number": 17637, "repo": "php/php-src", "title": "[ext-curl] Add `\\CURLOPT_INFILESIZE_LARGE`", ...
761
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index d3680c5755f25..c0cc8877bf991 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -344,6 +344,9 @@ PHP_FUNCTION(finfo_file) RETURN_THROWS(); } php_stream_context *context = php_stream_context_from_zval(zcontext, false); + if (!...
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index d3680c5755f25..c0cc8877bf991 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -344,6 +344,9 @@ PHP_FUNCTION(finfo_file) RETURN_THROWS(); } php_stream_context *context = php_stream_context_from_zval(zcontext, false); + if (!...
[ "+\t}", "+--FILE--", "+<?php" ]
[ 10, 24, 25 ]
{ "additions": 17, "author": "devnexen", "deletions": 0, "html_url": "https://github.com/php/php-src/pull/18269", "issue_id": 18269, "merged_at": "2025-04-08T21:43:11Z", "omission_probability": 0.1, "pr_number": 18269, "repo": "php/php-src", "title": "Fixed GH-18267 finfo_file() crashing on invalid ...
762
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index acd9c1220c20e..f0f80bd98e324 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -22,15 +22,22 @@ body: ``` validations: required: true - - type: input + ...
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index acd9c1220c20e..f0f80bd98e324 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -22,15 +22,22 @@ body: ``` + - type: textarea label: PHP Version - descrip...
[ "- - type: input" ]
[ 8 ]
{ "additions": 11, "author": "TimWolla", "deletions": 4, "html_url": "https://github.com/php/php-src/pull/18230", "issue_id": 18230, "merged_at": "2025-04-07T08:51:30Z", "omission_probability": 0.1, "pr_number": 18230, "repo": "php/php-src", "title": "[skip ci] Request the output of `php -v` in the ...
763
diff --git a/Zend/tests/attributes/nodiscard/005.phpt b/Zend/tests/attributes/nodiscard/005.phpt index ec8f33e5299d6..9ef1566372892 100644 --- a/Zend/tests/attributes/nodiscard/005.phpt +++ b/Zend/tests/attributes/nodiscard/005.phpt @@ -1,17 +1,11 @@ --TEST-- -#[\NoDiscard]: Native function and method. +#[\NoDiscard]:...
diff --git a/Zend/tests/attributes/nodiscard/005.phpt b/Zend/tests/attributes/nodiscard/005.phpt index ec8f33e5299d6..9ef1566372892 100644 --- a/Zend/tests/attributes/nodiscard/005.phpt +++ b/Zend/tests/attributes/nodiscard/005.phpt @@ -1,17 +1,11 @@ --TEST-- -#[\NoDiscard]: Native function and method. +#[\NoDiscard]:...
[ "-0004 SEND_VAR CV0($f) 1", "-0011 FREE V3", "-\tzend_string_release(attribute_name_NoDiscard_func_flock_0);", "+}", "+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_nodiscard, 0, 0, IS_LONG, 0)", "+#else", "+\tzend_string *attribute_name_NoDiscard_func_zend_test_nodiscard_0 = zend_string_ini...
[ 99, 106, 190, 213, 247, 287, 297, 302 ]
{ "additions": 71, "author": "TimWolla", "deletions": 66, "html_url": "https://github.com/php/php-src/pull/18255", "issue_id": 18255, "merged_at": "2025-04-08T12:23:03Z", "omission_probability": 0.1, "pr_number": 18255, "repo": "php/php-src", "title": "ext/standard: Remove `#[\\NoDiscard]` from `flo...
764
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 8747e11d151f..53cd8533fd3e 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -96,7 +96,7 @@ static void zend_type_copy_ctor(zend_type *const type, bool use_arena, bool pers } } -static zend_function *zend_duplicate_internal_fu...
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 8747e11d151f..53cd8533fd3e 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -96,7 +96,7 @@ static void zend_type_copy_ctor(zend_type *const type, bool use_arena, bool pers -static zend_function *zend_duplicate_internal_function(ze...
[ "-static zend_string *get_class_from_type(zend_class_entry *scope, zend_type single_type) {", "-\tfor (i = 0; i < num_args; i++) {", "+\tfor (uint32_t i = 0; i < num_args; i++) {", "-\t\tfor (i = 0; i < num_args;) {", "+\t\t\t\t\t\tconst zend_op *end = op + fptr->op_array.last;", "-static void do_inherit_...
[ 53, 87, 88, 105, 115, 213, 231, 232, 345, 403, 490, 503, 513, 528, 556, 571, 594, 623 ]
{ "additions": 71, "author": "Girgias", "deletions": 88, "html_url": "https://github.com/php/php-src/pull/18253", "issue_id": 18253, "merged_at": "2025-04-05T14:47:52Z", "omission_probability": 0.1, "pr_number": 18253, "repo": "php/php-src", "title": "Zend/zend_inheritance: Minor refactorings", "t...
765
diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c index ccafca48fe9b..6baa34cc5012 100644 --- a/Zend/zend_enum.c +++ b/Zend/zend_enum.c @@ -610,8 +610,7 @@ ZEND_API void zend_enum_add_case_cstr(zend_class_entry *ce, const char *name, zv zend_string_release(name_str); } -ZEND_API zend_object *zend_enum_get_case(zend...
diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c index ccafca48fe9b..6baa34cc5012 100644 --- a/Zend/zend_enum.c +++ b/Zend/zend_enum.c @@ -610,8 +610,7 @@ ZEND_API void zend_enum_add_case_cstr(zend_class_entry *ce, const char *name, zv zend_string_release(name_str); -ZEND_API zend_object *zend_enum_get_case(zend_clas...
[ "+}", "-\treturn result;" ]
[ 21, 27 ]
{ "additions": 8, "author": "nielsdos", "deletions": 6, "html_url": "https://github.com/php/php-src/pull/18239", "issue_id": 18239, "merged_at": "2025-04-04T16:02:48Z", "omission_probability": 0.1, "pr_number": 18239, "repo": "php/php-src", "title": "Avoid allocation in zend_enum_get_case_cstr()", ...
766
diff --git a/docs/source/miscellaneous/stubs.rst b/docs/source/miscellaneous/stubs.rst index 385eddc5be72f..3899fe3084196 100644 --- a/docs/source/miscellaneous/stubs.rst +++ b/docs/source/miscellaneous/stubs.rst @@ -13,11 +13,11 @@ code, but instead contain empty function and method bodies. A very basic stub lo /*...
diff --git a/docs/source/miscellaneous/stubs.rst b/docs/source/miscellaneous/stubs.rst index 385eddc5be72f..3899fe3084196 100644 --- a/docs/source/miscellaneous/stubs.rst +++ b/docs/source/miscellaneous/stubs.rst @@ -13,11 +13,11 @@ code, but instead contain empty function and method bodies. A very basic stub lo /*...
[ "+ function fahrenheitToCelsius(float $fahrenheitToCelsius): float {}", "+ function fahrenheitToCelsius(float $fahrenheit): float {}", "- Warning: Missing method synopsis for fahrenheitToCelcius()" ]
[ 14, 30, 87 ]
{ "additions": 13, "author": "jbampton", "deletions": 13, "html_url": "https://github.com/php/php-src/pull/18220", "issue_id": 18220, "merged_at": "2025-04-01T10:51:02Z", "omission_probability": 0.1, "pr_number": 18220, "repo": "php/php-src", "title": "docs: fix spelling in `stubs.rst`", "total_ch...
767
diff --git a/ext/standard/file.h b/ext/standard/file.h index 3a9cf1435b143..f8faebd028293 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -36,7 +36,6 @@ PHPAPI PHP_FUNCTION(fpassthru); PHP_MINIT_FUNCTION(user_streams); -PHPAPI int php_le_stream_context(void); PHPAPI zend_result php_copy_file(const c...
diff --git a/ext/standard/file.h b/ext/standard/file.h index 3a9cf1435b143..f8faebd028293 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -36,7 +36,6 @@ PHPAPI PHP_FUNCTION(fpassthru); PHP_MINIT_FUNCTION(user_streams); -PHPAPI int php_le_stream_context(void); PHPAPI zend_result php_copy_file(const char ...
[ "+\t\tphp_stream_context_get_default(nocontext))" ]
[ 48 ]
{ "additions": 11, "author": "Girgias", "deletions": 4, "html_url": "https://github.com/php/php-src/pull/18097", "issue_id": 18097, "merged_at": "2025-03-30T18:35:05Z", "omission_probability": 0.1, "pr_number": 18097, "repo": "php/php-src", "title": "main/streams: Move definitions to reduce ext/stan...
768
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 4efce87b1a9cd..3b9c9e2d22785 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -730,22 +730,29 @@ PHP_METHOD(SplFixedArray, fromArray) zend_ulong num_index, max_index = 0; zend_long tmp; - ZEND_HASH_FOREACH_KEY(Z_ARRVA...
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 4efce87b1a9cd..3b9c9e2d22785 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -730,22 +730,29 @@ PHP_METHOD(SplFixedArray, fromArray) zend_ulong num_index, max_index = 0; zend_long tmp; - if (str_index != NULL || (zend...
[ "-\t\tZEND_HASH_FOREACH_KEY(Z_ARRVAL_P(data), num_index, str_index) {", "+\t\t\t\t\tRETURN_THROWS();" ]
[ 8, 19 ]
{ "additions": 20, "author": "nielsdos", "deletions": 13, "html_url": "https://github.com/php/php-src/pull/18196", "issue_id": 18196, "merged_at": "2025-03-30T18:07:49Z", "omission_probability": 0.1, "pr_number": 18196, "repo": "php/php-src", "title": "Optimize SplFixedArray::fromArray() for packed ...
769
diff --git a/ext/standard/string.c b/ext/standard/string.c index b15a24a098faa..1e20791eb61ce 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1273,10 +1273,10 @@ PHP_FUNCTION(str_increment) ZSTR_VAL(tmp)[0] = ZSTR_VAL(incremented)[0]; break; } - zend_string_release_ex(incremented, /* pe...
diff --git a/ext/standard/string.c b/ext/standard/string.c index b15a24a098faa..1e20791eb61ce 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1273,10 +1273,10 @@ PHP_FUNCTION(str_increment) ZSTR_VAL(tmp)[0] = ZSTR_VAL(incremented)[0]; break; - zend_string_release_ex(incremented, /* persist...
[ "+\t\tzend_string_efree(incremented);" ]
[ 10 ]
{ "additions": 7, "author": "nielsdos", "deletions": 7, "html_url": "https://github.com/php/php-src/pull/18193", "issue_id": 18193, "merged_at": "2025-03-30T16:09:22Z", "omission_probability": 0.1, "pr_number": 18193, "repo": "php/php-src", "title": "Micro-optimizations to str_increment() and str_de...
770
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index b919501c0dd25..53ae39078ffc2 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -872,18 +872,6 @@ PHP_METHOD(SplFixedArray, getIterator) zend_create_internal_iterator_zval(return_value, ZEND_THIS); } -PHP_METHOD(SplFixedArr...
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index b919501c0dd25..53ae39078ffc2 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -872,18 +872,6 @@ PHP_METHOD(SplFixedArray, getIterator) zend_create_internal_iterator_zval(return_value, ZEND_THIS); -PHP_METHOD(SplFixedArray, j...
[ "+ * @implementation-alias SplFixedArray::toArray", "+ * Stub hash: 0c838fed60b29671fe04e63315ab662d8cb16f0c */", "+\tZEND_RAW_FENTRY(\"jsonSerialize\", zim_SplFixedArray_toArray, arginfo_class_SplFixedArray_jsonSerialize, ZEND_ACC_PUBLIC, NULL, NULL)" ]
[ 32, 43, 60 ]
{ "additions": 5, "author": "nielsdos", "deletions": 15, "html_url": "https://github.com/php/php-src/pull/18191", "issue_id": 18191, "merged_at": "2025-03-30T16:09:12Z", "omission_probability": 0.1, "pr_number": 18191, "repo": "php/php-src", "title": "Make SplFixedArray::jsonSerialize() an implement...
771
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index b919501c0dd25..ab81563caba9f 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -691,11 +691,16 @@ PHP_METHOD(SplFixedArray, toArray) intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (!spl_fixedarray_empty(&intern->array)) { - a...
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index b919501c0dd25..ab81563caba9f 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -691,11 +691,16 @@ PHP_METHOD(SplFixedArray, toArray) intern = Z_SPLFIXEDARRAY_P(ZEND_THIS); if (!spl_fixedarray_empty(&intern->array)) { - a...
[ "+" ]
[ 16 ]
{ "additions": 10, "author": "nielsdos", "deletions": 5, "html_url": "https://github.com/php/php-src/pull/18190", "issue_id": 18190, "merged_at": "2025-03-30T16:09:02Z", "omission_probability": 0.1, "pr_number": 18190, "repo": "php/php-src", "title": "Optimize SplFixedArray::toArray()", "total_cha...
772
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index b919501c0dd25..fa846e48eee03 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -324,14 +324,14 @@ static zend_object *spl_fixedarray_object_clone(zend_object *old_object) return new_object; } -static zend_long spl_offset_c...
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index b919501c0dd25..fa846e48eee03 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -324,14 +324,14 @@ static zend_object *spl_fixedarray_object_clone(zend_object *old_object) return new_object; +static zend_never_inline zend_ulon...
[ "-static zend_long spl_offset_convert_to_long(zval *offset) /* {{{ */", "+\t\tZEND_ASSERT(!EG(exception));" ]
[ 8, 34 ]
{ "additions": 28, "author": "nielsdos", "deletions": 24, "html_url": "https://github.com/php/php-src/pull/18184", "issue_id": 18184, "merged_at": "2025-03-30T11:16:34Z", "omission_probability": 0.1, "pr_number": 18184, "repo": "php/php-src", "title": "Optimize SplFixedArray dimension performance", ...
773
diff --git a/ext/dom/namespace_compat.c b/ext/dom/namespace_compat.c index 7a3bd68b0111a..ee32ec39dbeb3 100644 --- a/ext/dom/namespace_compat.c +++ b/ext/dom/namespace_compat.c @@ -180,7 +180,7 @@ PHP_DOM_EXPORT xmlNsPtr php_dom_libxml_ns_mapper_get_ns_raw_strings_nullsafe(php return php_dom_libxml_ns_mapper_get_ns_r...
diff --git a/ext/dom/namespace_compat.c b/ext/dom/namespace_compat.c index 7a3bd68b0111a..ee32ec39dbeb3 100644 --- a/ext/dom/namespace_compat.c +++ b/ext/dom/namespace_compat.c @@ -180,7 +180,7 @@ PHP_DOM_EXPORT xmlNsPtr php_dom_libxml_ns_mapper_get_ns_raw_strings_nullsafe(php return php_dom_libxml_ns_mapper_get_ns_r...
[]
[]
{ "additions": 2, "author": "nielsdos", "deletions": 9, "html_url": "https://github.com/php/php-src/pull/18182", "issue_id": 18182, "merged_at": "2025-03-29T21:46:19Z", "omission_probability": 0.1, "pr_number": 18182, "repo": "php/php-src", "title": "Remove useless operations in namespace_compat", ...
774
diff --git a/ext/standard/array.c b/ext/standard/array.c index 994e0ad34a8cb..aeaef847dd676 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6437,7 +6437,6 @@ PHP_FUNCTION(array_reduce) zval *input; zval args[2]; zval *operand; - zval retval; zend_fcall_info fci; zend_fcall_info_cache fci_cach...
diff --git a/ext/standard/array.c b/ext/standard/array.c index 994e0ad34a8cb..aeaef847dd676 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6437,7 +6437,6 @@ PHP_FUNCTION(array_reduce) zval *input; zval args[2]; zval *operand; - zval retval; zend_fcall_info fci; zend_fcall_info_cache fci_cach...
[]
[]
{ "additions": 8, "author": "nielsdos", "deletions": 12, "html_url": "https://github.com/php/php-src/pull/18180", "issue_id": 18180, "merged_at": "2025-03-29T21:45:58Z", "omission_probability": 0.1, "pr_number": 18180, "repo": "php/php-src", "title": "Avoid pointless refcounting in array_reduce", ...
775
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8462492651310..d26e238180262 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6509,6 +6509,22 @@ PHP_FUNCTION(array_reduce) } /* }}} */ +/* Consumes `zv` */ +static bool php_is_true(zval *zv) +{ + switch (Z_TYPE_P(zv)) { + case IS_TRUE:...
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8462492651310..d26e238180262 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6509,6 +6509,22 @@ PHP_FUNCTION(array_reduce) +/* Consumes `zv` */ +static bool php_is_true(zval *zv) +{ + case IS_TRUE: + return true; + case IS_FALSE: + re...
[ "+\tswitch (Z_TYPE_P(zv)) {", "+", "-\t\tbool retval_true = zend_is_true(&retval);" ]
[ 11, 23, 67 ]
{ "additions": 27, "author": "nielsdos", "deletions": 16, "html_url": "https://github.com/php/php-src/pull/18157", "issue_id": 18157, "merged_at": "2025-03-27T22:52:54Z", "omission_probability": 0.1, "pr_number": 18157, "repo": "php/php-src", "title": "Improve performance of array_find() etc", "to...
776
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 13b5e6a394434..eb5ccd7bd0bd0 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -23,6 +23,8 @@ PHP 8.5 INTERNALS UPGRADE NOTES for fake closures. . Added smart_string_append_printf() matching smart_str_append_printf() for char* instead...
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 13b5e6a394434..eb5ccd7bd0bd0 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -23,6 +23,8 @@ PHP 8.5 INTERNALS UPGRADE NOTES for fake closures. . Added smart_string_append_printf() matching smart_str_append_printf() for char* instead...
[ "+ZEND_ATTRIBUTE_CONST PHPAPI const char *php_build_provider(void)", "+{", "+#ifdef PHP_BUILD_PROVIDER", "+\treturn NULL;", "+#endif", "+ * no build provider was specified. This is useful for extensions which want" ]
[ 58, 59, 60, 63, 64, 121 ]
{ "additions": 37, "author": "TimWolla", "deletions": 18, "html_url": "https://github.com/php/php-src/pull/18168", "issue_id": 18168, "merged_at": "2025-03-29T12:29:41Z", "omission_probability": 0.1, "pr_number": 18168, "repo": "php/php-src", "title": "Add `php_build_provider()`", "total_changes":...
777
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8462492651310..fdabd5d88ab30 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -632,6 +632,18 @@ PHPAPI zend_long php_count_recursive(HashTable *ht) /* {{{ */ } /* }}} */ +/* Consumes `zv` */ +static zend_always_inline zend_long php_get_lo...
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8462492651310..fdabd5d88ab30 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -632,6 +632,18 @@ PHPAPI zend_long php_count_recursive(HashTable *ht) /* {{{ */ +/* Consumes `zv` */ +static zend_always_inline zend_long php_get_long(zval *zv) +{ ...
[ "+\t\treturn ret;", "-\tZVAL_COPY(&args[1], &s->val);", "+\tZVAL_COPY_VALUE(&args[1], &s->val);", "+\t\t\tZVAL_COPY_VALUE(&args[0], &s->val);", "-\t\t\t\tZVAL_STR_COPY(&args[0], s->key);" ]
[ 16, 40, 42, 69, 122 ]
{ "additions": 32, "author": "nielsdos", "deletions": 51, "html_url": "https://github.com/php/php-src/pull/18166", "issue_id": 18166, "merged_at": "2025-03-29T00:02:17Z", "omission_probability": 0.1, "pr_number": 18166, "repo": "php/php-src", "title": "Improve performance of user-callbacked sort fun...
778
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index dd3b9535a1626..4895463db4b08 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -619,27 +619,29 @@ static bool pgsql_handle_rollback(pdo_dbh_t *dbh) static bool _pdo_pgsql_send_copy_data(pdo_pgsql_db_handle *H...
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index dd3b9535a1626..4895463db4b08 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -619,27 +619,29 @@ static bool pgsql_handle_rollback(pdo_dbh_t *dbh) static bool _pdo_pgsql_send_copy_data(pdo_pgsql_db_handle *H, ...
[ "-\t\tquery[query_len++] = '\\n';" ]
[ 23 ]
{ "additions": 11, "author": "devnexen", "deletions": 9, "html_url": "https://github.com/php/php-src/pull/18175", "issue_id": 18175, "merged_at": "2025-03-28T18:24:46Z", "omission_probability": 0.1, "pr_number": 18175, "repo": "php/php-src", "title": "ext/pdo_pgsql: updating copy from according to p...
779
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8462492651310..25b1b6088378f 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6736,16 +6736,12 @@ PHP_FUNCTION(array_map) ZEND_PARSE_PARAMETERS_END(); if (n_arrays == 1) { - zend_ulong num_key; - zend_string *str_key; - zval *zv, ar...
diff --git a/ext/standard/array.c b/ext/standard/array.c index 8462492651310..25b1b6088378f 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6736,16 +6736,12 @@ PHP_FUNCTION(array_map) ZEND_PARSE_PARAMETERS_END(); if (n_arrays == 1) { - zend_string *str_key; - zval *zv, arg; - int ret; if (Z_T...
[ "-\t\tzend_ulong num_key;", "-\t\t\tfci.retval = &result;", "-\t\t\tret = zend_call_function(&fci, &fci_cache);", "+\t\t\tZEND_HASH_FILL_PACKED(output) {", "+\t\t\t\t\t\t}", "+\t\t\t\t\t\tundefs++;", "+\t\t} else {", "+\t\t\tarray_init_size(return_value, maxlen);", "+\t\t\t\t\tzend_array_destroy(out...
[ 8, 31, 36, 57, 70, 73, 79, 83, 92, 93, 97 ]
{ "additions": 61, "author": "nielsdos", "deletions": 28, "html_url": "https://github.com/php/php-src/pull/18158", "issue_id": 18158, "merged_at": "2025-03-28T18:09:49Z", "omission_probability": 0.1, "pr_number": 18158, "repo": "php/php-src", "title": "Improve performance of array_map()", "total_c...
780
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ed89c9d494a6f..a533552621f2a 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -673,7 +673,7 @@ static const char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib /* }}} */ /* {{{ date_format - (gm)date helper */ -static zend_str...
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ed89c9d494a6f..a533552621f2a 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -673,7 +673,7 @@ static const char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib /* {{{ date_format - (gm)date helper */ -static zend_string *date_for...
[ "-PHPAPI zend_string *php_format_date_obj(const char *format, size_t format_len, php_date_obj *date_obj)", "-static void zval_from_error_container(zval *z, timelib_error_container *error) /* {{{ */", "+static void zval_from_error_container(zval *z, const timelib_error_container *error) /* {{{ */", "+static vo...
[ 17, 96, 97, 106, 115, 159, 295, 330, 340, 349, 374 ]
{ "additions": 41, "author": "Girgias", "deletions": 60, "html_url": "https://github.com/php/php-src/pull/18044", "issue_id": 18044, "merged_at": "2025-03-28T16:55:37Z", "omission_probability": 0.1, "pr_number": 18044, "repo": "php/php-src", "title": "ext/date: Various minor refactorings", "total_...
781
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index d2ab4e13fc52c..13b5e6a394434 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -21,6 +21,8 @@ PHP 8.5 INTERNALS UPGRADE NOTES could interfere. . zend_get_callable_name() now returns the name of the underlying function for fake closure...
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index d2ab4e13fc52c..13b5e6a394434 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -21,6 +21,8 @@ PHP 8.5 INTERNALS UPGRADE NOTES could interfere. . zend_get_callable_name() now returns the name of the underlying function for fake closure...
[ "+\tva_end(arg);" ]
[ 25 ]
{ "additions": 12, "author": "TimWolla", "deletions": 0, "html_url": "https://github.com/php/php-src/pull/18160", "issue_id": 18160, "merged_at": "2025-03-27T19:15:25Z", "omission_probability": 0.1, "pr_number": 18160, "repo": "php/php-src", "title": "zend_smart_string: Add `smart_string_append_prin...
782
diff --git a/NEWS b/NEWS index 285bf4e23a80d..dc464b1abecab 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ PHP NEWS (ilutov) . Fixed bug GH-17376 (Broken JIT polymorphism for property hooks added to child class). (ilutov) + . Fixed bug G...
diff --git a/NEWS b/NEWS index 285bf4e23a80d..dc464b1abecab 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ PHP NEWS (ilutov) . Fixed bug GH-17376 (Broken JIT polymorphism for property hooks added to child class). (ilutov) + . Fixed bug G...
[ "+\t\tcall.fn_flags = mptr->common.fn_flags & (ZEND_ACC_STATIC | ZEND_ACC_DEPRECATED);", "+\t\ttrampoline.attributes = mptr->common.attributes;", "+class Clazz {", "+?>" ]
[ 22, 44, 59, 94 ]
{ "additions": 76, "author": "TimWolla", "deletions": 2, "html_url": "https://github.com/php/php-src/pull/17914", "issue_id": 17914, "merged_at": "2025-02-27T13:48:09Z", "omission_probability": 0.1, "pr_number": 17914, "repo": "php/php-src", "title": "Fix `ReflectionFunction::isDeprecated()` for mat...
783
diff --git a/Zend/tests/closures/closure_const_expr/attributes.phpt b/Zend/tests/closures/closure_const_expr/attributes.phpt index c83b821d12969..e331bc2edd568 100644 --- a/Zend/tests/closures/closure_const_expr/attributes.phpt +++ b/Zend/tests/closures/closure_const_expr/attributes.phpt @@ -8,13 +8,13 @@ reflection #...
diff --git a/Zend/tests/closures/closure_const_expr/attributes.phpt b/Zend/tests/closures/closure_const_expr/attributes.phpt index c83b821d12969..e331bc2edd568 100644 --- a/Zend/tests/closures/closure_const_expr/attributes.phpt +++ b/Zend/tests/closures/closure_const_expr/attributes.phpt @@ -8,13 +8,13 @@ reflection #...
[ "+#[Attr(static function (...$args) {", "+ object(Closure)#%d (3) {", "+array(2) {", "+ array(3) {", "+ [2]=>", "+\t\tcase FUNC_DECL_LEVEL_CONSTEXPR:", "-\t\t\t\top_array->dynamic_func_defs[i]->static_variables = NULL;" ]
[ 29, 69, 145, 169, 174, 253, 270 ]
{ "additions": 169, "author": "TimWolla", "deletions": 24, "html_url": "https://github.com/php/php-src/pull/17853", "issue_id": 17853, "merged_at": "2025-03-27T09:11:45Z", "omission_probability": 0.1, "pr_number": 17853, "repo": "php/php-src", "title": "Zend: Fix reference counting for Closures in c...
784
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 7aedca43d02ce..5fc4bd6b643b5 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -336,40 +336,40 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const } smart_str_ap...
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 7aedca43d02ce..5fc4bd6b643b5 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -336,40 +336,40 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, const smart_str_append_...
[ "+\t\tsmart_str_appends(str, \"trait \");", "+\t\t\tsmart_str_appends(str, \"final \");", "+\t\t\tsmart_str_appends(str, \"readonly \");", "-\t\tsmart_str_append_printf(str, \"class \");", "+\t\t\tsmart_str_appends(str, \"\\n - INI {\\n\");" ]
[ 24, 35, 39, 41, 154 ]
{ "additions": 26, "author": "DanielEScherzer", "deletions": 26, "html_url": "https://github.com/php/php-src/pull/18155", "issue_id": 18155, "merged_at": "2025-03-26T23:00:34Z", "omission_probability": 0.1, "pr_number": 18155, "repo": "php/php-src", "title": "Reflection: optimize smart_str building"...
785
diff --git a/ext/bcmath/libbcmath/src/convert.c b/ext/bcmath/libbcmath/src/convert.c index bf3d9a9a415bf..5438b4c1c44e5 100644 --- a/ext/bcmath/libbcmath/src/convert.c +++ b/ext/bcmath/libbcmath/src/convert.c @@ -17,24 +17,22 @@ #include "bcmath.h" #include "convert.h" #include "private.h" -#ifdef __SSE2__ -# includ...
diff --git a/ext/bcmath/libbcmath/src/convert.c b/ext/bcmath/libbcmath/src/convert.c index bf3d9a9a415bf..5438b4c1c44e5 100644 --- a/ext/bcmath/libbcmath/src/convert.c +++ b/ext/bcmath/libbcmath/src/convert.c @@ -17,24 +17,22 @@ char *bc_copy_and_toggle_bcd(char *restrict dest, const char *source, const char *source_e...
[ "-\t__m128i shift_vector = _mm_set1_epi8('0');", "+\tbc_simd_128_t shift_vector = bc_simd_set_8x16('0');", "+\t\tbytes = bc_simd_xor_8x16(bytes, shift_vector);", "+#ifdef __SSE2__", "+ typedef __m128i bc_simd_128_t;", "+# define bc_simd_cmplt_8x16(a, b) _mm_cmplt_epi8(a, b)", "+# define bc_simd_add_8x1...
[ 19, 26, 29, 65, 67, 75, 86, 93, 100, 166 ]
{ "additions": 88, "author": "SakiTakamachi", "deletions": 33, "html_url": "https://github.com/php/php-src/pull/18130", "issue_id": 18130, "merged_at": "2025-03-25T22:48:03Z", "omission_probability": 0.1, "pr_number": 18130, "repo": "php/php-src", "title": "ext/bcmath: In the arm processor environme...
786
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index bcea06a83d7ad..d1d9ee60c440a 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -113,9 +113,9 @@ enumerate_providers_fn (const char * const name, array_init(&tmp_array); - add_assoc_string(&tmp_array, "name", (char *)name); - add_asso...
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index bcea06a83d7ad..d1d9ee60c440a 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -113,9 +113,9 @@ enumerate_providers_fn (const char * const name, - add_assoc_string(&tmp_array, "name", (char *)name); - add_assoc_string(&tmp_array, "desc", (...
[ "+\tadd_assoc_string(zdesc, \"name\", name);", "-\t\t\tenchant_broker_set_param(pbroker->pbroker, \"enchant.myspell.dictionary.path\", (const char *)value);" ]
[ 26, 60 ]
{ "additions": 15, "author": "Girgias", "deletions": 15, "html_url": "https://github.com/php/php-src/pull/18141", "issue_id": 18141, "merged_at": "2025-03-25T06:59:57Z", "omission_probability": 0.1, "pr_number": 18141, "repo": "php/php-src", "title": "ext/enchant: Remove useless char* casts", "tot...
787
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt index e644bfa6ce962..240cef37a17a2 100644 --- a/ext/bz2/tests/004.phpt +++ b/ext/bz2/tests/004.phpt @@ -112,8 +112,8 @@ array(2) { } string(10) "DATA_ERROR" int(-4) -bzread(): supplied resource is not a valid stream resource -bzerror(): supplied resource i...
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt index e644bfa6ce962..240cef37a17a2 100644 --- a/ext/bz2/tests/004.phpt +++ b/ext/bz2/tests/004.phpt @@ -112,8 +112,8 @@ array(2) { string(10) "DATA_ERROR" int(-4) -bzerror(): supplied resource is not a valid stream resource -bzerrstr(): supplied resource is...
[ "-bzread(): supplied resource is not a valid stream resource", "+bzerrstr(): Argument #1 ($bz) must be an open stream resource", "-fgetc(): supplied resource is not a valid stream resource", "+fclose(): Argument #1 ($stream) must be an open stream resource", "-stream_get_meta_data(): supplied resource is no...
[ 8, 14, 429, 581, 600, 651, 687 ]
{ "additions": 101, "author": "Girgias", "deletions": 98, "html_url": "https://github.com/php/php-src/pull/18078", "issue_id": 18078, "merged_at": "2025-03-24T22:54:35Z", "omission_probability": 0.1, "pr_number": 18078, "repo": "php/php-src", "title": "streams: Indicate which argument fails the stre...
788
diff --git a/NEWS b/NEWS index fcb849ef98a58..a5609377683ed 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,8 @@ PHP NEWS . Fixed bug GH-18033 (NULL-ptr dereference when using register_tick_function in destructor). (nielsdos) . Fixed bug GH-180...
diff --git a/NEWS b/NEWS index fcb849ef98a58..a5609377683ed 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,8 @@ PHP NEWS . Fixed bug GH-18033 (NULL-ptr dereference when using register_tick_function in destructor). (nielsdos) . Fixed bug GH-180...
[ "-\t\tcase ZEND_FREE:", "+$r = fopen(__FILE__, \"r\");", "+ 9876545,", "+ (void)$var;", "+\t\t\topline = zend_emit_op(NULL, ZEND_FREE, &expr_node, NULL);", "+\t\t\topline->extended_value = ZEND_FREE_VOID_CAST;", "+/**" ]
[ 50, 74, 93, 105, 238, 239, 327 ]
{ "additions": 158, "author": "TimWolla", "deletions": 3, "html_url": "https://github.com/php/php-src/pull/18115", "issue_id": 18115, "merged_at": "2025-03-24T18:35:31Z", "omission_probability": 0.1, "pr_number": 18115, "repo": "php/php-src", "title": "Add `(void)` cast", "total_changes": 161 }
789
diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 1bf1ee876b40f..d87bda1a0d5af 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -3907,6 +3907,21 @@ int main(int argc, char ** argv) { res_ok(res, {{ "success", true }}); }; + const auto handle_api_sho...
diff --git a/examples/server/server.cpp b/examples/server/server.cpp index 1bf1ee876b40f..d87bda1a0d5af 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -3907,6 +3907,21 @@ int main(int argc, char ** argv) { res_ok(res, {{ "success", true }}); }; + "template", c...
[ "+ const auto handle_api_show = [&ctx_server, &res_ok](const httplib::Request &, httplib::Response & res) {", "+ json data = {" ]
[ 8, 9 ]
{ "additions": 16, "author": "ggerganov", "deletions": 0, "html_url": "https://github.com/ggml-org/llama.cpp/pull/12896", "issue_id": 12896, "merged_at": "2025-04-11T20:37:41Z", "omission_probability": 0.1, "pr_number": 12896, "repo": "ggml-org/llama.cpp", "title": "server : add VSCode's Github Copi...
790
diff --git a/src/llama-context.cpp b/src/llama-context.cpp index 983385f86d494..a52b6850b465d 100644 --- a/src/llama-context.cpp +++ b/src/llama-context.cpp @@ -469,8 +469,7 @@ ggml_tensor * llama_context::build_rope_shift( ggml_tensor * shift, ggml_tensor * factors, float freq_base, ...
diff --git a/src/llama-context.cpp b/src/llama-context.cpp index 983385f86d494..a52b6850b465d 100644 --- a/src/llama-context.cpp +++ b/src/llama-context.cpp @@ -469,8 +469,7 @@ ggml_tensor * llama_context::build_rope_shift( const auto & n_ctx_orig = cparams.n_ctx_orig_yarn; const auto & yarn_ext_factor = cpa...
[ "- ggml_backend_buffer * bbuf) const {", "+ float freq_scale) const {", "- // Figure out which backend KV cache belongs to", "- ggml_tensor * cur = build_rope_shift(ctx0, k, inp->k_shift, rope_factors, freq_base_l, freq_scale_l, kv_self->k_l[il]->buffer);" ]
[ 9, 10, 20, 37 ]
{ "additions": 4, "author": "slaren", "deletions": 16, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13113", "issue_id": 13113, "merged_at": "2025-04-25T17:40:11Z", "omission_probability": 0.1, "pr_number": 13113, "repo": "ggml-org/llama.cpp", "title": "llama : fix K-shift with quantized K...
791
diff --git a/examples/llava/clip.cpp b/examples/llava/clip.cpp index 4eec4a2646798..5c858a167b021 100644 --- a/examples/llava/clip.cpp +++ b/examples/llava/clip.cpp @@ -556,15 +556,15 @@ static ggml_cgraph * clip_image_build_graph_siglip(clip_ctx * ctx, const clip_im } // implementation of the 2D RoPE without addin...
diff --git a/examples/llava/clip.cpp b/examples/llava/clip.cpp index 4eec4a2646798..5c858a167b021 100644 --- a/examples/llava/clip.cpp +++ b/examples/llava/clip.cpp @@ -556,15 +556,15 @@ static ggml_cgraph * clip_image_build_graph_siglip(clip_ctx * ctx, const clip_im // implementation of the 2D RoPE without adding a n...
[ "- ggml_tensor * tmp;", "- // for the first half, the trick here is to rotate n_dim/2, so inv_freq will be even", "- cur,", "+ K = build_rope_2d(ctx0, K, pos_h, pos_w, hparams.rope_theta);", "+ // ┌──W──┐", "+ // │ H │ channel = G", "+ // └─────┘ │",...
[ 18, 27, 45, 95, 126, 129, 132, 151 ]
{ "additions": 48, "author": "ngxson", "deletions": 22, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13097", "issue_id": 13097, "merged_at": "2025-04-25T12:31:42Z", "omission_probability": 0.1, "pr_number": 13097, "repo": "ggml-org/llama.cpp", "title": "clip : fix pixtral on some GPU back...
792
diff --git a/ggml/src/ggml-sycl/common.hpp b/ggml/src/ggml-sycl/common.hpp index 3e1ceeaa49486..a8187b0a9187f 100644 --- a/ggml/src/ggml-sycl/common.hpp +++ b/ggml/src/ggml-sycl/common.hpp @@ -313,7 +313,6 @@ struct ggml_backend_sycl_context { int device; std::string name; optimize_feature opt_feature; -...
diff --git a/ggml/src/ggml-sycl/common.hpp b/ggml/src/ggml-sycl/common.hpp index 3e1ceeaa49486..a8187b0a9187f 100644 --- a/ggml/src/ggml-sycl/common.hpp +++ b/ggml/src/ggml-sycl/common.hpp @@ -313,7 +313,6 @@ struct ggml_backend_sycl_context { int device; std::string name; optimize_feature opt_feature; ...
[ "- bool optimized_graph=false;", "+ SYCL_CHECK(", "+ {", "+ *(qs_ptr + ib * QK4_0 / 2 + j) = x[ib].qs[j];", "+ *(d_ptr + ib) = x[ib].d;", "+static void reorder_qw(const ggml_tensor * src0, dpct::queue_ptr stream) {", "+/*", "+ if (!g_ggml_sycl_disable_opti...
[ 8, 32, 48, 49, 51, 57, 66, 71, 151, 168 ]
{ "additions": 61, "author": "NeoZhangJianyu", "deletions": 65, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13003", "issue_id": 13003, "merged_at": "2025-04-25T09:37:51Z", "omission_probability": 0.1, "pr_number": 13003, "repo": "ggml-org/llama.cpp", "title": "[SYCL][OPT] Fix reorder opt...
793
diff --git a/ggml/include/ggml-rpc.h b/ggml/include/ggml-rpc.h index c8b6097f7e573..1e674112767c9 100644 --- a/ggml/include/ggml-rpc.h +++ b/ggml/include/ggml-rpc.h @@ -7,7 +7,7 @@ extern "C" { #endif -#define RPC_PROTO_MAJOR_VERSION 1 +#define RPC_PROTO_MAJOR_VERSION 2 #define RPC_PROTO_MINOR_VERSION 0 ...
diff --git a/ggml/include/ggml-rpc.h b/ggml/include/ggml-rpc.h index c8b6097f7e573..1e674112767c9 100644 --- a/ggml/include/ggml-rpc.h +++ b/ggml/include/ggml-rpc.h @@ -7,7 +7,7 @@ extern "C" { #endif -#define RPC_PROTO_MAJOR_VERSION 1 +#define RPC_PROTO_MAJOR_VERSION 2 #define RPC_PROTO_MINOR_VERSION 0 #d...
[ "+", "+// RPC request : | rpc_cmd (1 byte) | request_size (8 bytes) | request_data (request_size bytes) |" ]
[ 34, 35 ]
{ "additions": 13, "author": "rgerganov", "deletions": 7, "html_url": "https://github.com/ggml-org/llama.cpp/pull/12943", "issue_id": 12943, "merged_at": "2025-04-25T07:08:09Z", "omission_probability": 0.1, "pr_number": 12943, "repo": "ggml-org/llama.cpp", "title": "rpc : do not wait for response wh...
794
diff --git a/examples/llava/clip-impl.h b/examples/llava/clip-impl.h index 8d310fb0271c5..53ac381304765 100644 --- a/examples/llava/clip-impl.h +++ b/examples/llava/clip-impl.h @@ -90,8 +90,6 @@ #define TN_GLM_ADAPTER_D_H_2_4H "adapter.linear.dense_h_to_4h.%s" #define TN_GLM_ADAPTER_GATE "adapter.linear.gate.%s" ...
diff --git a/examples/llava/clip-impl.h b/examples/llava/clip-impl.h index 8d310fb0271c5..53ac381304765 100644 --- a/examples/llava/clip-impl.h +++ b/examples/llava/clip-impl.h @@ -90,8 +90,6 @@ #define TN_GLM_ADAPTER_D_H_2_4H "adapter.linear.dense_h_to_4h.%s" #define TN_GLM_ADAPTER_GATE "adapter.linear.gate.%s" ...
[ "+ return clip_n_patches(ctx) * clip_n_mmproj_embd(ctx) * sizeof(float);" ]
[ 41 ]
{ "additions": 6, "author": "ngxson", "deletions": 18, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13081", "issue_id": 13081, "merged_at": "2025-04-24T20:17:05Z", "omission_probability": 0.1, "pr_number": 13081, "repo": "ggml-org/llama.cpp", "title": "clip : remove boi/eoi embeddings for...
795
diff --git a/common/arg.cpp b/common/arg.cpp index 47c26955ea374..fa22e86cd14e6 100644 --- a/common/arg.cpp +++ b/common/arg.cpp @@ -1,6 +1,7 @@ #include "gguf.h" // for reading GGUF splits #include "arg.h" +#include "common.h" #include "log.h" #include "sampling.h" #include "chat.h" @@ -848,6 +849,10 @@ static ...
diff --git a/common/arg.cpp b/common/arg.cpp index 47c26955ea374..fa22e86cd14e6 100644 --- a/common/arg.cpp +++ b/common/arg.cpp @@ -1,6 +1,7 @@ #include "gguf.h" // for reading GGUF splits #include "arg.h" +#include "common.h" #include "log.h" #include "sampling.h" #include "chat.h" @@ -848,6 +849,10 @@ static bo...
[ "+ if (!params.tensor_buft_overrides.empty()) {", "+ std::string tensor_name = override.substr(0, pos);", "+ printf(\"Available buffer types:\\n\");", "- cparams.offload_kqv;", "+ if (std::regex_search(tensor_name, pattern)) {", "+ ...
[ 16, 47, 51, 162, 254, 256, 312 ]
{ "additions": 108, "author": "slaren", "deletions": 9, "html_url": "https://github.com/ggml-org/llama.cpp/pull/11397", "issue_id": 11397, "merged_at": "2025-04-02T12:52:01Z", "omission_probability": 0.1, "pr_number": 11397, "repo": "ggml-org/llama.cpp", "title": "llama : add option to override mode...
796
diff --git a/examples/server/public/index.html.gz b/examples/server/public/index.html.gz index 941815c22efb0..674e227571e2d 100644 Binary files a/examples/server/public/index.html.gz and b/examples/server/public/index.html.gz differ diff --git a/examples/server/webui/src/components/ChatScreen.tsx b/examples/server/webu...
diff --git a/examples/server/public/index.html.gz b/examples/server/public/index.html.gz index 941815c22efb0..674e227571e2d 100644 Binary files a/examples/server/public/index.html.gz and b/examples/server/public/index.html.gz differ diff --git a/examples/server/webui/src/components/ChatScreen.tsx b/examples/server/webu...
[ "+ // On lg+ screens, the hook will calculate and set the initial height anyway", "-// See https://github.com/ggml-org/llama.cpp/pull/12299", "- }", "- setValue: (value: string) => {", "+import { useEffect, useRef, useState, useCallback } from 'react';", "+ // Effect to set initial value...
[ 56, 76, 85, 92, 113, 162, 201, 205 ]
{ "additions": 111, "author": "characharm", "deletions": 47, "html_url": "https://github.com/ggml-org/llama.cpp/pull/12785", "issue_id": 12785, "merged_at": "2025-04-08T09:14:59Z", "omission_probability": 0.1, "pr_number": 12785, "repo": "ggml-org/llama.cpp", "title": " Improve Chat Input with Auto-...
797
diff --git a/convert_hf_to_gguf.py b/convert_hf_to_gguf.py index 89522dee8b8ad..d277b8c7327c7 100755 --- a/convert_hf_to_gguf.py +++ b/convert_hf_to_gguf.py @@ -4934,10 +4934,25 @@ class Glm4Model(Model): model_arch = gguf.MODEL_ARCH.GLM4 def set_vocab(self): - self._set_vocab_gpt2() + from tr...
diff --git a/convert_hf_to_gguf.py b/convert_hf_to_gguf.py index 89522dee8b8ad..d277b8c7327c7 100755 --- a/convert_hf_to_gguf.py +++ b/convert_hf_to_gguf.py @@ -4934,10 +4934,25 @@ class Glm4Model(Model): model_arch = gguf.MODEL_ARCH.GLM4 def set_vocab(self): + from transformers import AutoTokenizer + ...
[ "- self._set_vocab_gpt2()", "+ special_vocab._set_special_token(\"unk\", tokenizer.get_added_vocab()[\"<|endoftext|>\"])" ]
[ 8, 20 ]
{ "additions": 16, "author": "piDack", "deletions": 1, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13021", "issue_id": 13021, "merged_at": "2025-04-23T14:59:14Z", "omission_probability": 0.1, "pr_number": 13021, "repo": "ggml-org/llama.cpp", "title": "Append mult-eos,half-rope,bos to GLM...
798
diff --git a/ggml/src/ggml-cuda/mmq.cuh b/ggml/src/ggml-cuda/mmq.cuh index 532358018f410..3cb2015520ba1 100644 --- a/ggml/src/ggml-cuda/mmq.cuh +++ b/ggml/src/ggml-cuda/mmq.cuh @@ -155,25 +155,27 @@ static constexpr __device__ int get_mmq_y_device() { #define MMQ_DP4A_TXS_Q6_K tile_x_sizes{mmq_y*WARP_SIZE*2 + mmq_y...
diff --git a/ggml/src/ggml-cuda/mmq.cuh b/ggml/src/ggml-cuda/mmq.cuh index 532358018f410..3cb2015520ba1 100644 --- a/ggml/src/ggml-cuda/mmq.cuh +++ b/ggml/src/ggml-cuda/mmq.cuh @@ -155,25 +155,27 @@ static constexpr __device__ int get_mmq_y_device() { #define MMQ_DP4A_TXS_Q6_K tile_x_sizes{mmq_y*WARP_SIZE*2 + mmq_y...
[ "- type == GGML_TYPE_Q4_K ? MMQ_DP4A_TXS_Q4_K :", "- type == GGML_TYPE_IQ3_S ? MMQ_DP4A_TXS_Q8_0 :", "- type == GGML_TYPE_IQ1_S ? MMQ_DP4A_TXS_Q8_0 :", "- type == GGML_TYPE_IQ4_XS ? MMQ_DP4A_TXS_Q8_0 :", "+ case GGML_TYPE_Q4_K: return MMQ_DP4A_TXS_Q4_K;", "- ...
[ 15, 22, 23, 24, 35, 66, 75, 76, 79, 124, 134, 138, 139, 164, 165, 179, 183 ]
{ "additions": 84, "author": "JohannesGaessler", "deletions": 76, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13095", "issue_id": 13095, "merged_at": "2025-04-24T13:57:10Z", "omission_probability": 0.1, "pr_number": 13095, "repo": "ggml-org/llama.cpp", "title": "CUDA: use switch statemen...
799
diff --git a/common/arg.cpp b/common/arg.cpp index 1cfd0168d95ae..aa8310d119029 100644 --- a/common/arg.cpp +++ b/common/arg.cpp @@ -968,7 +968,6 @@ static void common_params_print_completion(common_params_context & ctx_arg) { "llama-embedding", "llama-eval-callback", "llama-export-lora", - ...
diff --git a/common/arg.cpp b/common/arg.cpp index 1cfd0168d95ae..aa8310d119029 100644 --- a/common/arg.cpp +++ b/common/arg.cpp @@ -968,7 +968,6 @@ static void common_params_print_completion(common_params_context & ctx_arg) { "llama-embedding", "llama-eval-callback", "llama-export-lora", - ...
[ "- add_subdirectory(gbnf-validator)", "- endif()", "-add_executable(${TARGET} gbnf-validator.cpp)", "-target_include_directories(llama PUBLIC . ../include)", "+ if (DEFINED LLAMA_TEST_NAME)", "+ llama_build(test-quantize-stats.cpp)", "+llama_build_and_test(test-model-load-cancel.cpp LAB...
[ 30, 31, 54, 91, 107, 176, 223, 224, 234, 361 ]
{ "additions": 64, "author": "ggerganov", "deletions": 69, "html_url": "https://github.com/ggml-org/llama.cpp/pull/13062", "issue_id": 13062, "merged_at": "2025-04-24T13:00:10Z", "omission_probability": 0.1, "pr_number": 13062, "repo": "ggml-org/llama.cpp", "title": "cmake : do not include ./src as ...