Optimize StringBuilder append for static strings, and as_string().

core/string/string_builder.cpp

@@ -45,8 +45,10 @@ StringBuilder &StringBuilder::append(const String &p_string) {
 	return *this;
 }
 
-StringBuilder &StringBuilder::append(const char *p_cstring) {
-	int32_t len = strlen(p_cstring);
+StringBuilder &StringBuilder::append(const char *p_cstring, const uint32_t len) {
+	if (!p_cstring || len == 0) {
+		return *this;
+	}
 
 	c_strings.push_back(p_cstring);
 	appended_strings.push_back(len);
@@ -62,31 +64,29 @@ String StringBuilder::as_string() const {
 	}
 
 	char32_t *buffer = memnew_arr(char32_t, string_length);
-
-	int current_position = 0;
+	char32_t *buffer_ptr = buffer;
 
 	int godot_string_elem = 0;
 	int c_string_elem = 0;
 
 	for (int i = 0; i < appended_strings.size(); i++) {
-		if (appended_strings[i] == -1) {
+		const int c_string_len = appended_strings[i];
+
+		if (c_string_len == -1) {
 			// Godot string
 			const String &s = strings[godot_string_elem];
 
-			memcpy(buffer + current_position, s.ptr(), s.length() * sizeof(char32_t));
-
-			current_position += s.length();
+			memcpy(buffer_ptr, s.ptr(), s.length() * sizeof(char32_t));
+			buffer_ptr += s.length();
 
 			godot_string_elem++;
 		} else {
 			const char *s = c_strings[c_string_elem];
 
-			for (int32_t j = 0; j < appended_strings[i]; j++) {
-				buffer[current_position + j] = s[j];
+			for (int32_t j = 0; j < c_string_len; ++j, ++buffer_ptr, ++s) {
+				*buffer_ptr = *s;
 			}
 
-			current_position += appended_strings[i];
-
 			c_string_elem++;
 		}
 	}

core/string/string_builder.h

@@ -32,36 +32,55 @@
 #define STRING_BUILDER_H
 
 #include "core/string/ustring.h"
-#include "core/templates/vector.h"
+#include "core/templates/local_vector.h"
 
 class StringBuilder {
 	uint32_t string_length = 0;
 
-	Vector<String> strings;
-	Vector<const char *> c_strings;
+	LocalVector<String> strings;
+	LocalVector<const char *> c_strings;
 
 	// -1 means it's a Godot String
 	// a natural number means C string.
-	Vector<int32_t> appended_strings;
+	LocalVector<int32_t> appended_strings;
 
 public:
 	StringBuilder &append(const String &p_string);
-	StringBuilder &append(const char *p_cstring);
+	StringBuilder &append(const char *p_cstring, uint32_t len);
+
+	template <uint32_t len>
+	_FORCE_INLINE_ StringBuilder &append(const char (&p_cstring)[len]) {
+		return append(p_cstring, len - 1);
+	}
+
+	_FORCE_INLINE_ StringBuilder &append(const char *p_cstring) {
+		return append(p_cstring, strlen(p_cstring));
+	}
 
 	_FORCE_INLINE_ StringBuilder &operator+(const String &p_string) {
 		return append(p_string);
 	}
 
+	template <uint32_t len>
+	_FORCE_INLINE_ StringBuilder &operator+(const char (&p_cstring)[len]) {
+		return append(p_cstring, len - 1);
+	}
+
 	_FORCE_INLINE_ StringBuilder &operator+(const char *p_cstring) {
-		return append(p_cstring);
+		return append(p_cstring, strlen(p_cstring));
 	}
 
 	_FORCE_INLINE_ void operator+=(const String &p_string) {
 		append(p_string);
 	}
 
+	template <uint32_t len>
+	_FORCE_INLINE_ void operator+=(const char (&p_cstring)[len]) {
+		append(p_cstring, len - 1);
+	}
+
 	_FORCE_INLINE_ void operator+=(const char *p_cstring) {
-		append(p_cstring);
+		append(p_cstring, strlen(p_cstring));
 	}
 
 	_FORCE_INLINE_ int num_strings_appended() const {