Skip to content

Commit 85d6388

Browse files
committed
Creating branches/google/stable and tags/google/stable/2019-01-18 from r351319
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/google/stable@351578 91177308-0d34-0410-b5e6-96231b3b80d8
2 parents 36b8e0d + 82a2c96 commit 85d6388

File tree

3,040 files changed

+176380
-63377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,040 files changed

+176380
-63377
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ autoconf/autom4te.cache
4343
/compile_commands.json
4444
# Visual Studio built-in CMake configuration
4545
/CMakeSettings.json
46+
# CLion project configuration
47+
/.idea
4648

4749
#==============================================================================#
4850
# Directories to ignore (do not add trailing '/'s, they skip symlinks).

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ endif()
104104
# LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS
105105
# This allows an easy way of setting up a build directory for llvm and another
106106
# one for llvm+clang+... using the same sources.
107-
set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;lld;polly;debuginfo-tests")
107+
set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;libunwind;lldb;compiler-rt;lld;polly;debuginfo-tests")
108108
set(LLVM_ENABLE_PROJECTS "" CACHE STRING
109109
"Semicolon-separated list of projects to build (${LLVM_ALL_PROJECTS}), or \"all\".")
110110
if( LLVM_ENABLE_PROJECTS STREQUAL "all" )

CODE_OWNERS.TXT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ D: Loop Strength Reduction, Register allocators
7171
N: Andrea Di Biagio
7272
7373
74-
D: llvm-mca
74+
D: MCA, llvm-mca
7575

7676
N: Duncan P. N. Exon Smith
7777

LICENSE.TXT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LLVM Release License
44
University of Illinois/NCSA
55
Open Source License
66

7-
Copyright (c) 2003-2018 University of Illinois at Urbana-Champaign.
7+
Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign.
88
All rights reserved.
99

1010
Developed by:

RELEASE_TESTERS.TXT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ O: Ubuntu
1313

1414
N: Sylvestre Ledru
1515
16-
T: x86
17-
O: Debian
16+
T: All supported archs Debian/Ubuntu
17+
O: Debian/Ubuntu packages
1818

1919
N: Nikola Smiljanic
2020

bindings/go/llvm/InstrumentationBindings.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "llvm/IR/LegacyPassManager.h"
1717
#include "llvm/IR/Module.h"
1818
#include "llvm/Transforms/Instrumentation.h"
19+
#include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
20+
#include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
1921

2022
using namespace llvm;
2123

@@ -28,11 +30,11 @@ void LLVMAddAddressSanitizerModulePass(LLVMPassManagerRef PM) {
2830
}
2931

3032
void LLVMAddThreadSanitizerPass(LLVMPassManagerRef PM) {
31-
unwrap(PM)->add(createThreadSanitizerPass());
33+
unwrap(PM)->add(createThreadSanitizerLegacyPassPass());
3234
}
3335

34-
void LLVMAddMemorySanitizerPass(LLVMPassManagerRef PM) {
35-
unwrap(PM)->add(createMemorySanitizerPass());
36+
void LLVMAddMemorySanitizerLegacyPassPass(LLVMPassManagerRef PM) {
37+
unwrap(PM)->add(createMemorySanitizerLegacyPassPass());
3638
}
3739

3840
void LLVMAddDataFlowSanitizerPass(LLVMPassManagerRef PM,

bindings/go/llvm/InstrumentationBindings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extern "C" {
2727
void LLVMAddAddressSanitizerFunctionPass(LLVMPassManagerRef PM);
2828
void LLVMAddAddressSanitizerModulePass(LLVMPassManagerRef PM);
2929
void LLVMAddThreadSanitizerPass(LLVMPassManagerRef PM);
30-
void LLVMAddMemorySanitizerPass(LLVMPassManagerRef PM);
30+
void LLVMAddMemorySanitizerLegacyPassPass(LLVMPassManagerRef PM);
3131
void LLVMAddDataFlowSanitizerPass(LLVMPassManagerRef PM, int ABIListFilesNum,
3232
const char **ABIListFiles);
3333

bindings/go/llvm/transforms_instrumentation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func (pm PassManager) AddThreadSanitizerPass() {
3232
C.LLVMAddThreadSanitizerPass(pm.C)
3333
}
3434

35-
func (pm PassManager) AddMemorySanitizerPass() {
36-
C.LLVMAddMemorySanitizerPass(pm.C)
35+
func (pm PassManager) AddMemorySanitizerLegacyPassPass() {
36+
C.LLVMAddMemorySanitizerLegacyPassPass(pm.C)
3737
}
3838

3939
func (pm PassManager) AddDataFlowSanitizerPass(abilist []string) {

bindings/python/llvm/core.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# License. See LICENSE.TXT for details.
77
#
88
#===------------------------------------------------------------------------===#
9+
from __future__ import print_function
910

1011
from .common import LLVMObject
1112
from .common import c_object_p
@@ -18,6 +19,8 @@
1819
from ctypes import c_char_p
1920
from ctypes import c_uint
2021

22+
import sys
23+
2124
__all__ = [
2225
"lib",
2326
"Enums",
@@ -235,7 +238,7 @@ def __init__(self, module, reverse=False):
235238
def __iter__(self):
236239
return self
237240

238-
def next(self):
241+
def __next__(self):
239242
if not isinstance(self.function, Function):
240243
raise StopIteration("")
241244
result = self.function
@@ -244,7 +247,10 @@ def next(self):
244247
else:
245248
self.function = self.function.next
246249
return result
247-
250+
251+
if sys.version_info.major == 2:
252+
next = __next__
253+
248254
def __iter__(self):
249255
return Module.__function_iterator(self)
250256

@@ -303,7 +309,7 @@ def __init__(self, function, reverse=False):
303309
def __iter__(self):
304310
return self
305311

306-
def next(self):
312+
def __next__(self):
307313
if not isinstance(self.bb, BasicBlock):
308314
raise StopIteration("")
309315
result = self.bb
@@ -312,6 +318,9 @@ def next(self):
312318
else:
313319
self.bb = self.bb.next
314320
return result
321+
322+
if sys.version_info.major == 2:
323+
next = __next__
315324

316325
def __iter__(self):
317326
return Function.__bb_iterator(self)
@@ -380,7 +389,7 @@ def __init__(self, bb, reverse=False):
380389
def __iter__(self):
381390
return self
382391

383-
def next(self):
392+
def __next__(self):
384393
if not isinstance(self.inst, Instruction):
385394
raise StopIteration("")
386395
result = self.inst
@@ -389,7 +398,10 @@ def next(self):
389398
else:
390399
self.inst = self.inst.next
391400
return result
392-
401+
402+
if sys.version_info.major == 2:
403+
next = __next__
404+
393405
def __iter__(self):
394406
return BasicBlock.__inst_iterator(self)
395407

@@ -605,7 +617,7 @@ def register_enumerations():
605617
]
606618
for enum_class, enum_spec in enums:
607619
for name, value in enum_spec:
608-
print name, value
620+
print(name, value)
609621
enum_class.register(name, value)
610622
return enums
611623

bindings/python/llvm/tests/base.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import os.path
2+
import sys
23
import unittest
34

5+
46
POSSIBLE_TEST_BINARIES = [
57
'libreadline.so.5',
68
'libreadline.so.6',
@@ -15,6 +17,9 @@
1517
]
1618

1719
class TestBase(unittest.TestCase):
20+
if sys.version_info.major == 2:
21+
assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
22+
1823
def get_test_binary(self):
1924
"""Helper to obtain a test binary for object file testing.
2025

0 commit comments

Comments
 (0)