maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #36358 from vnen/gdscript-variant-ref-fix

Browse source 
Remove static script reference from GDScript class
This commit is contained in:
Rémi Verschelde 2020-02-19 15:41:03 +01:00 committed by GitHub
parent 7c5ce0ac7c 4d960efafc
commit b5729a82e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/class_db.cpp
View file

@ -1410,10 +1410,7 @@ Variant ClassDB::class_get_default_property_value(const StringName &p_class, con
cleanup_c = false; cleanup_c = false;
} else if (ClassDB::can_instance(p_class)) { } else if (ClassDB::can_instance(p_class)) {
c = ClassDB::instance(p_class); c = ClassDB::instance(p_class);
#ifndef _MSC_VER cleanup_c = true;
#warning FIXME: ObjectID refactoring broke GDScript handling of reference pointers, this needs a proper fix.
#endif
cleanup_c = (p_class != StringName("GDScript"));
} }
if (c) { if (c) {

1
modules/gdscript/gdscript.cpp
View file

@ -995,7 +995,6 @@ void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
GDScript::GDScript() : GDScript::GDScript() :
script_list(this) { script_list(this) {
_static_ref = this;
valid = false; valid = false;
subclass_count = 0; subclass_count = 0;
initializer = NULL; initializer = NULL;

1
modules/gdscript/gdscript.h
View file

@ -73,7 +73,6 @@ class GDScript : public Script {
friend class GDScriptFunctions; friend class GDScriptFunctions;
friend class GDScriptLanguage; friend class GDScriptLanguage;
Variant _static_ref; //used for static call
Ref<GDScriptNativeClass> native; Ref<GDScriptNativeClass> native;
Ref<GDScript> base; Ref<GDScript> base;
GDScript *_base; //fast pointer access GDScript *_base; //fast pointer access

15
modules/gdscript/gdscript_function.cpp
View file

@ -34,7 +34,7 @@
#include "gdscript.h" #include "gdscript.h"
#include "gdscript_functions.h" #include "gdscript_functions.h"
Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant *p_stack, String &r_error) const { Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant &static_ref, Variant *p_stack, String &r_error) const {
int address = p_address & ADDR_MASK; int address = p_address & ADDR_MASK;
@ -52,7 +52,7 @@ Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_insta
} break; } break;
case ADDR_TYPE_CLASS: { case ADDR_TYPE_CLASS: {
return &p_script->_static_ref; return &static_ref;
} break; } break;
case ADDR_TYPE_MEMBER: { case ADDR_TYPE_MEMBER: {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
@ -270,6 +270,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
r_err.error = Variant::CallError::CALL_OK; r_err.error = Variant::CallError::CALL_OK;
Variant self; Variant self;
Variant static_ref;
Variant retvalue; Variant retvalue;
Variant *stack = NULL; Variant *stack = NULL;
Variant **call_args; Variant **call_args;
@ -404,10 +405,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
#define CHECK_SPACE(m_space) \ #define CHECK_SPACE(m_space) \
GD_ERR_BREAK((ip + m_space) > _code_size) GD_ERR_BREAK((ip + m_space) > _code_size)
#define GET_VARIANT_PTR(m_v, m_code_ofs) \ #define GET_VARIANT_PTR(m_v, m_code_ofs) \
Variant *m_v; \ Variant *m_v; \
m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, stack, err_text); \ m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, static_ref, stack, err_text); \
if (unlikely(!m_v)) \ if (unlikely(!m_v)) \
OPCODE_BREAK; OPCODE_BREAK;
#else #else
@ -415,7 +416,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
#define CHECK_SPACE(m_space) #define CHECK_SPACE(m_space)
#define GET_VARIANT_PTR(m_v, m_code_ofs) \ #define GET_VARIANT_PTR(m_v, m_code_ofs) \
Variant *m_v; \ Variant *m_v; \
m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, stack, err_text); m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, static_ref, stack, err_text);
#endif #endif

2
modules/gdscript/gdscript_function.h
View file

@ -265,7 +265,7 @@ private:
List<StackDebug> stack_debug; List<StackDebug> stack_debug;
_FORCE_INLINE_ Variant *_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant *p_stack, String &r_error) const; _FORCE_INLINE_ Variant *_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant &static_ref, Variant *p_stack, String &r_error) const;
_FORCE_INLINE_ String _get_call_error(const Variant::CallError &p_err, const String &p_where, const Variant **argptrs) const; _FORCE_INLINE_ String _get_call_error(const Variant::CallError &p_err, const String &p_where, const Variant **argptrs) const;
friend class GDScriptLanguage; friend class GDScriptLanguage;