OLD | NEW |
1 unchanged: | 1 unchanged: |
2 --- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_file.cc 2015-12-
30 13:21:46.000000000 -0800 | 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 | 3 +++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_file.cc 2016-03-
31 13:25:40.252007316 -0700 |
4 @@ -337,7 +337,7 @@ | 4 @@ -342,8 +342,8 @@ |
5 "namespace {\n" | 5 "namespace {\n" |
6 "\n" | 6 "\n" |
7 "static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD;\n" | 7 "static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD" |
8 - "static void MergeFromFail(int line) {\n" | 8 " GOOGLE_ATTRIBUTE_NORETURN;\n" |
9 + "GOOGLE_ATTRIBUTE_NOINLINE static void MergeFromFail(int line) {\n" | 9 - "static void MergeFromFail(int line) {\n" |
10 " GOOGLE_CHECK(false) << __FILE__ << \":\" << line;\n" | 10 + "GOOGLE_ATTRIBUTE_NOINLINE static void MergeFromFail(int line) {\n" |
11 "}\n" | 11 " ::google::protobuf::internal::MergeFromFail(__FILE__, line);\n" |
12 "\n" | 12 "}\n" |
| 13 "\n" |
13 only in patch2: | 14 only in patch2: |
14 unchanged: | 15 unchanged: |
15 --- protobuf-cleaned/src/google/protobuf/compiler/cpp/cpp_message.cc 2015-12-
30 13:21:46.000000000 -0800 | 16 --- 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 +++ protobuf-patched/src/google/protobuf/compiler/cpp/cpp_message.cc 2016-03-
31 13:25:40.888006485 -0700 |
17 @@ -1035,7 +1035,7 @@ | 18 @@ -1035,7 +1035,7 @@ |
18 } | 19 } |
19 | 20 |
20 printer->Print(vars, | 21 printer->Print(vars, |
21 - "void Swap($classname$* other);\n" | 22 - "void Swap($classname$* other);\n" |
22 + "GOOGLE_ATTRIBUTE_NOINLINE void Swap($classname$* other);\n" | 23 + "GOOGLE_ATTRIBUTE_NOINLINE void Swap($classname$* other);\n" |
23 "\n" | 24 "\n" |
24 "// implements Message ----------------------------------------------\n" | 25 "// implements Message ----------------------------------------------\n" |
25 "\n" | 26 "\n" |
26 @@ -2586,7 +2586,7 @@ | 27 @@ -2586,7 +2586,7 @@ |
27 // ownership situation: swapping across arenas or between an arena and a | 28 // ownership situation: swapping across arenas or between an arena and a |
28 // heap requires copying. | 29 // heap requires copying. |
29 printer->Print( | 30 printer->Print( |
30 - "void $classname$::Swap($classname$* other) {\n" | 31 - "void $classname$::Swap($classname$* other) {\n" |
31 + "GOOGLE_ATTRIBUTE_NOINLINE void $classname$::Swap($classname$* other) {
\n" | 32 + "GOOGLE_ATTRIBUTE_NOINLINE void $classname$::Swap($classname$* other) {
\n" |
32 " if (other == this) return;\n" | 33 " if (other == this) return;\n" |
33 " if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {\n" | 34 " if (GetArenaNoVirtual() == other->GetArenaNoVirtual()) {\n" |
34 " InternalSwap(other);\n" | 35 " InternalSwap(other);\n" |
OLD | NEW |