Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: third_party/protobuf/patches/0010-uninline-generated-code.patch

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/patches/0010-uninline-generated-code.patch
diff --git a/third_party/protobuf/patches/0010-uninline-generated-code.patch b/third_party/protobuf/patches/0010-uninline-generated-code.patch
new file mode 100644
index 0000000000000000000000000000000000000000..85274dee8dcceb279f5b9164664b43ebeafad7a0
--- /dev/null
+++ b/third_party/protobuf/patches/0010-uninline-generated-code.patch
@@ -0,0 +1,34 @@
+unchanged:
+--- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_file.cc 2015-12-30 13:21:46.000000000 -0800
++++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_file.cc 2016-03-31 13:25:40.252007316 -0700
+@@ -337,7 +337,7 @@
+ "namespace {\n"
+ "\n"
+ "static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;\n"
+- "static void MergeFromFail(int line) {\n"
++ "GOOGLE_ATTRIBUTE_NOINLINE static void MergeFromFail(int line) {\n"
+ " GOOGLE_CHECK(false) << __FILE__ << \":\" << line;\n"
+ "}\n"
+ "\n"
+only in patch2:
+unchanged:
+--- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_message.cc 2015-12-30 13:21:46.000000000 -0800
++++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_message.cc 2016-03-31 13:25:40.888006485 -0700
+@@ -1035,7 +1035,7 @@
+ }
+
+ printer->Print(vars,
+- "void Swap($classname$* other);\n"
++ "GOOGLE_ATTRIBUTE_NOINLINE void Swap($classname$* other);\n"
+ "\n"
+ "// implements Message ----------------------------------------------\n"
+ "\n"
+@@ -2586,7 +2586,7 @@
+ // ownership situation: swapping across arenas or between an arena and a
+ // heap requires copying.
+ printer->Print(
+- "void $classname$::Swap($classname$* other) {\n"
++ "GOOGLE_ATTRIBUTE_NOINLINE void $classname$::Swap($classname$* other) {\n"
+ " if (other == this) return;\n"
+ " if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {\n"
+ " InternalSwap(other);\n"
« no previous file with comments | « third_party/protobuf/patches/0009-uninline-arenastring.patch ('k') | third_party/protobuf/post_process_dist.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698