<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05a94521b067f9358f90932b02a0a7b0412651c7">https://github.com/macports/macports-ports/commit/05a94521b067f9358f90932b02a0a7b0412651c7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 05a9452 llvm-3.9: Update to 3.9.1
</span>05a9452 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05a94521b067f9358f90932b02a0a7b0412651c7
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sat Dec 24 16:35:17 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> llvm-3.9: Update to 3.9.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
lang/llvm-3.9/Portfile | 39 ++++++-----
...ly-Prepare-clang-format-for-replacement-w.patch | 2 +-
...ly-Fix-name-of-scan-view-executable-insid.patch | 2 +-
.../1003-Default-to-ppc7400-for-OSX-10.5.patch | 2 +-
...etpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch | 2 +-
...fragile-ObjC-runtime-when-targeting-darwi.patch | 2 +-
...dc-header-search-paths-for-older-versions.patch | 2 +-
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 2 +-
...diagnose-an-array-type-mismatch-when-the-.patch | 80 ++++++++++++++++++++++
9 files changed, 107 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/Portfile b/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c583efc..79e8d85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> #default_variants-append +assertions
#default_variants-append +debug
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${llvm_version}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${llvm_version}.1
</span> epoch 1
master_sites http://llvm.org/releases/${version}
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,24 +91,24 @@ if {${distfiles} ne ""} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums llvm-3.9.0.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bbde781a914f6cd7fab3f71745fc576b2e7e23c9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfe-3.9.0.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a33d18142ce0fd69db59a96b75ffcfd20cef2f2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7596a7c7d9376d0c89e60028fe1ceb4d3e535e8ea8b89e0eb094e0dcb3183d28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler-rt-3.9.0.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3276ce7ef5031d47024345e2db16767885fd2278 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e0e5224fcd5740b61e416c549dd3dcda92f10c524216c1edb5e979e42078a59a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcxx-3.9.0.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 977a7c44cd29a4ba45d4ea36ac4e9c9a119e259d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d0b38d51365c6322f5666a2a8105785f2e114430858de4c25a86b49f227f5b06 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-tools-extra-3.9.0.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 42264f2f895cea4330a5041d6b803551aeb1d2d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b7aec46ec8e999ec683c87ad744082e1133781ee4b01905b4bdae5d20785f14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- polly-3.9.0.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 76b4fba05ffbfa1ce1486e80b55824fdcbfcbfe2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef0dd25010099baad84597cf150b543c84feac2574d055d6780463d5de8cd97e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums llvm-3.9.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b0a3c68cfec83a2b4dad6922316b71c0dc25c40a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfe-3.9.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 51930c2d55eacd44df28b49a84565771c94f418e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler-rt-3.9.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 15cb816616a09d83f76b65f4443884af475b4437 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d30967b1a5fa51a2503474aacc913e69fd05ae862d37bf310088955bdb13ec99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcxx-3.9.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 43bcf879f60763425f5d296f4fa5ac0b9a0779f6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25e615e428f60e651ed09ffd79e563864e3f4bc69a9e93ee41505c419d1a7461 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang-tools-extra-3.9.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d3293699daafa69aaa062f47de4903ac8445d01a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 29a5b65bdeff7767782d4427c7c64d54c3a8684bc6b217b74a70e575e4813635 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ polly-3.9.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4d4109afd1f5b090301134dbba7dfd66a25a2bc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9ba5e61fc7bf8c7435f64e2629e0810c9b1d1b03aa5b5605b780d0e177b4cb46
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,6 +130,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1008-Sema-Don-t-diagnose-an-array-type-mismatch-when-the-.patch \
</span> 2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 360daba..b161fa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 414a01012e221fc9961850249ca125b4acef4b53 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1001/1007] MacPorts Only: Prepare clang-format for replacement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
</span> with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch b/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 023a55c..ae8de30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 53121d98756c5cf424944d4fdb580d85570ffa14 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1002/1007] MacPorts Only: Fix name of scan-view executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1002/1008] MacPorts Only: Fix name of scan-view executable
</span> inside scan-build
http://trac.macports.org/ticket/35006
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch b/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bd560e..3cdf34b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1003-Default-to-ppc7400-for-OSX-10.5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 401ab6b5acdc617adda6eef1d43a0c08cef9b204 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1003/1007] Default to ppc7400 for OSX 10.5+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1003/1008] Default to ppc7400 for OSX 10.5+
</span>
(cherry picked from commit 5662f0184c9e491e7df297feff4de37a678a0a4e)
---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch b/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 413ed62..dafa660 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1004-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From bcaa03506820cfd97a2f329cd3c5ab561dcc6630 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 17 Jan 2015 19:08:57 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1004/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1004/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
</span> PRIO_DARWIN_BG) if it is available
Tiger and earlier versions of darwin do not support this.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch b/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 02bd8fd..4e21eb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1005-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 91297b3486d4c28cb2245cb0b5b7d65a7d5f9020 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Jan 2015 00:09:16 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1005/1007] Default to fragile ObjC runtime when targeting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1005/1008] Default to fragile ObjC runtime when targeting
</span> darwin/ppc
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch b/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a951e8..8015d98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1006-Fixup-libstdc-header-search-paths-for-older-versions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 80574643241dab77a873ed2d8e3db7e6b178a081 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 31 Oct 2016 15:06:36 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1006/1007] Fixup libstdc++ header search paths for older
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1006/1008] Fixup libstdc++ header search paths for older
</span> versions of Mac OS X
The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-3.9/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 98279a5..6fc05bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 85489ac7deb860a626365e0915f20615a898639e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 15:53:39 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1007/1007] Fix build issues pre-Lion due to missing a strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1007/1008] Fix build issues pre-Lion due to missing a strnlen
</span> definition
https://trac.macports.org/ticket/51520
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/1008-Sema-Don-t-diagnose-an-array-type-mismatch-when-the-.patch b/lang/llvm-3.9/files/1008-Sema-Don-t-diagnose-an-array-type-mismatch-when-the-.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bb86e99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/1008-Sema-Don-t-diagnose-an-array-type-mismatch-when-the-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,80 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bd0e205220432ede1f4f42b8b57722e72eb62fc4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Akira Hatanaka <ahatanaka@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 1 Sep 2016 01:03:21 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1008/1008] [Sema] Don't diagnose an array type mismatch when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the new or previous declaration has a dependent type.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This fixes a bug where clang errors out on a valid code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rdar://problem/28051467
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Differential Revision: https://reviews.llvm.org/D24110
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@280330 91177308-0d34-0410-b5e6-96231b3b80d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 0c1c1751472348ead92a1c5ffd6a7db08dd446e7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Sema/SemaDecl.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test/SemaTemplate/array-redeclaration.cpp | 33 +++++++++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 35 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 test/SemaTemplate/array-redeclaration.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/lib/Sema/SemaDecl.cpp macports_release_39/tools/clang/lib/Sema/SemaDecl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 41719d4e7b..4a9a2fee20 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_39/tools/clang/lib/Sema/SemaDecl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/lib/Sema/SemaDecl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3367,11 +3367,11 @@ void Sema::MergeVarDeclTypes(VarDecl *New, VarDecl *Old,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // We are merging a variable declaration New into Old. If it has an array
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // bound, and that bound differs from Old's bound, we should diagnose the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // mismatch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!NewArray->isIncompleteArrayType()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!NewArray->isIncompleteArrayType() && !NewArray->isDependentType()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (VarDecl *PrevVD = Old->getMostRecentDecl(); PrevVD;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PrevVD = PrevVD->getPreviousDecl()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const ArrayType *PrevVDTy = Context.getAsArrayType(PrevVD->getType());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (PrevVDTy->isIncompleteArrayType())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (PrevVDTy->isIncompleteArrayType() || PrevVDTy->isDependentType())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!Context.hasSameType(NewArray, PrevVDTy))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_39/tools/clang/test/SemaTemplate/array-redeclaration.cpp macports_release_39/tools/clang/test/SemaTemplate/array-redeclaration.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000000..4edee701cf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_39/tools/clang/test/SemaTemplate/array-redeclaration.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// RUN: %clang_cc1 -fsyntax-only -verify %s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// expected-no-diagnostics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int array[1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template <typename>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class C {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ enum { D };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ template <typename A> void foo1() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern int array[((int)C<A>::k > (int)D) ? 1 : -1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template<>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class C<int> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const static int k = 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void foo2() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ C<char> c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c.foo1<int>();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template<int n>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void foo3() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern int array[n ? 1 : -1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void foo4() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ foo3<5>();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>