third_party/protobuf/patches/0010-uninline-generated-code.patch - Issue 2599263002: third_party/protobuf: Update to HEAD (f52e188fe4)

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 2599263002: third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)

Patch Set: Created 3 years, 12 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 unified diff | Download patch

« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/patches/0009-uninline-arenastring.patch ('k') | third_party/protobuf/patches/0011-libprotobuf_export.patch » ('j') | third_party/protobuf/patches/0012-fixes-for-js-embed-cc.patch » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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	1 --- 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	2 +++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_message.cc 2016-03- 31 13:25:40.888006485 -0700

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

18 }	4 }

19	5

20 printer->Print(vars,	6 printer->Print(vars,

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

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

23 "\n"	9 "\n"

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

25 "\n"	11 "\n"

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

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

28 // heap requires copying.	14 // heap requires copying.

29 printer->Print(	15 printer->Print(

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

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

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

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

34 " InternalSwap(other);\n"	20 " InternalSwap(other);\n"

OLD	NEW