Skip to content

[PHP] Optimized away hex2bin() call in generated code #8006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haberman merged 6 commits into from
Nov 5, 2020
Merged

[PHP] Optimized away hex2bin() call in generated code #8006

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2187eb0
Updated PHP generator to output raw binary strings instead of requiri…
haberman Oct 15, 2020
d140b1c
Optimizations for loading of descriptors in PHP:
haberman Oct 15, 2020
4936abe
Fixed bug with oneofs in JSON decoding.
haberman Oct 15, 2020
e1b42ab
Disable assertions for release build.
haberman Oct 15, 2020
8ea3826
Put NDEBUG in upb, not in CFLAGS.
haberman Oct 15, 2020
e8a442f
Merge branch 'master' into php-internaladd
haberman Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions src/google/protobuf/compiler/php/php_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,16 +1010,28 @@ void GenerateAddFileToPool(const FileDescriptor* file, const Options& options,
std::string files_data;
files.SerializeToString(&files_data);

printer->Print("$pool->internalAddGeneratedFile(hex2bin(\n");
printer->Print("$pool->internalAddGeneratedFile(\n");
Indent(printer);
printer->Print("'");

for (auto ch : files_data) {
switch (ch) {
case '\\':
printer->Print(R"(\\)");
break;
case '\'':
printer->Print(R"(\')");
break;
default:
printer->Print("^char^", "char", std::string(1, ch));
break;
}
}

printer->Print(
"\"^data^\"\n",
"data", BinaryToHex(files_data));

printer->Print("'\n");
Outdent(printer);
printer->Print(
"), true);\n\n");
", true);\n\n");
}
printer->Print(
"static::$is_initialized = true;\n");
Expand Down Expand Up @@ -1145,16 +1157,28 @@ void GenerateAddFilesToPool(const FileDescriptor* file, const Options& options,
std::string files_data;
sorted_file_set.SerializeToString(&files_data);

printer->Print("$pool->internalAddGeneratedFile(hex2bin(\n");
printer->Print("$pool->internalAddGeneratedFile(\n");
Indent(printer);
printer->Print("'");

printer->Print(
"\"^data^\"\n",
"data", BinaryToHex(files_data));
for (auto ch : files_data) {
switch (ch) {
case '\\':
printer->Print(R"(\\)");
break;
case '\'':
printer->Print(R"(\')");
break;
default:
printer->Print("^char^", "char", std::string(1, ch));
break;
}
}

printer->Print("'\n");
Outdent(printer);
printer->Print(
"), true);\n");
", true);\n");

printer->Print(
"static::$is_initialized = true;\n");
Expand Down