third_party/protobuf/patches/0010-uninline-generated-code.patch - Issue 1842653006: Update //third_party/protobuf to version 3.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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:

OLD	NEW
(Empty)
	1 unchanged:

	2 --- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_file.cc 2015-12- 30 13:21:46.000000000 -0800

	3 +++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_file.cc 2016-03- 31 13:25:40.252007316 -0700

	4 @@ -337,7 +337,7 @@

	5 "namespace {\n"

	6 "\n"

	7 "static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;\n"

	8 - "static void MergeFromFail(int line) {\n"

	9 + "GOOGLE_ATTRIBUTE_NOINLINE static void MergeFromFail(int line) {\n"

	10 " GOOGLE_CHECK(false) << __FILE__ << \":\" << line;\n"

	11 "}\n"

	12 "\n"

	13 only in patch2:

	14 unchanged:

	15 --- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_message.cc 2015-12- 30 13:21:46.000000000 -0800

	16 +++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_message.cc 2016-03- 31 13:25:40.888006485 -0700

	17 @@ -1035,7 +1035,7 @@

	18 }

	19

	20 printer->Print(vars,

	21 - "void Swap($classname$* other);\n"

	22 + "GOOGLE_ATTRIBUTE_NOINLINE void Swap($classname$* other);\n"

	23 "\n"

	24 "// implements Message ----------------------------------------------\n"

	25 "\n"

	26 @@ -2586,7 +2586,7 @@

	27 // ownership situation: swapping across arenas or between an arena and a

	28 // heap requires copying.

	29 printer->Print(

	30 - "void $classname$::Swap($classname$* other) {\n"

	31 + "GOOGLE_ATTRIBUTE_NOINLINE void $classname$::Swap($classname$* other) { \n"

	32 " if (other == this) return;\n"

	33 " if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {\n"

	34 " InternalSwap(other);\n"

OLD	NEW