Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-30 Thread Bruno Cardoso Lopes via cfe-commits 
bruno added a comment.

Committed r264987!



Comment at: lib/Driver/Driver.cpp:2549-2550
@@ +2548,4 @@
+  unsigned CurDigit = 0;
+  unsigned MaxDigits = Digits.size();
+  while (CurDigit < MaxDigits) {
+unsigned Digit = (unsigned)strtol(Str, , 10);

rnk wrote:
> nit: Why not `CurDigit < Digits.size()`?
No specific reason. Done!


http://reviews.llvm.org/D18304



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-30 Thread Reid Kleckner via cfe-commits 
rnk accepted this revision.
rnk added a reviewer: rnk.
rnk added a comment.
This revision is now accepted and ready to land.

lgtm, go for it



Comment at: lib/Driver/Driver.cpp:2549-2550
@@ +2548,4 @@
+  unsigned CurDigit = 0;
+  unsigned MaxDigits = Digits.size();
+  while (CurDigit < MaxDigits) {
+unsigned Digit = (unsigned)strtol(Str, , 10);

nit: Why not `CurDigit < Digits.size()`?


http://reviews.llvm.org/D18304



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-30 Thread Duncan P. N. Exon Smith via cfe-commits 
dexonsmith added a subscriber: dexonsmith.
dexonsmith added a comment.

LGTM from the Darwin-side, assuming Reid doesn't have any more comments.


http://reviews.llvm.org/D18304



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-30 Thread Duncan P. N. Exon Smith via cfe-commits 
LGTM from the Darwin-side, assuming Reid doesn't have any more comments.

> On 2016-Mar-28, at 13:12, Bruno Cardoso Lopes  wrote:
> 
> bruno updated this revision to Diff 51828.
> bruno added a comment.
> 
> Thanks Reid. The original idea was to have MaxDigits despite the size of the 
> input array (but bounded by its size). But since there are no other users up 
> to this point, your suggestion seems better, updated the patch to reflect it.
> 
> 
> http://reviews.llvm.org/D18304
> 
> Files:
>  include/clang/Driver/Driver.h
>  lib/Driver/Driver.cpp
>  lib/Driver/Tools.cpp
>  test/Driver/darwin-ld.c
> 
> 

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-28 Thread Bruno Cardoso Lopes via cfe-commits 
bruno updated this revision to Diff 51828.
bruno added a comment.

Thanks Reid. The original idea was to have MaxDigits despite the size of the 
input array (but bounded by its size). But since there are no other users up to 
this point, your suggestion seems better, updated the patch to reflect it.


http://reviews.llvm.org/D18304

Files:
  include/clang/Driver/Driver.h
  lib/Driver/Driver.cpp
  lib/Driver/Tools.cpp
  test/Driver/darwin-ld.c

Index: test/Driver/darwin-ld.c
===
--- test/Driver/darwin-ld.c
+++ test/Driver/darwin-ld.c
@@ -303,3 +303,27 @@
 // RUN:   FileCheck --check-prefix=LINK-IFRAMEWORK %s
 // LINK-IFRAMEWORK: {{ld(.exe)?"}}
 // LINK-IFRAMEWORK: "-FBar"
+
+// Check ld64 accepts up to 5 digits with no extra characters
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3 2> %t.log
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3.0 2>> %t.log
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3.0.1 2>> %t.log
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3.0.1.2 2>> %t.log
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3.0.1.2.6 2>> %t.log
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3.0.1.a 2>> %t.log
+// RUN: %clang -target x86_64-apple-darwin12 %s -### -o %t \
+// RUN:   -mlinker-version=133.3.0.1a 2>> %t.log
+// RUN: FileCheck -check-prefix=LINK_VERSION_DIGITS %s < %t.log
+// LINK_VERSION_DIGITS-NOT: invalid version number in '-mlinker-version=133.3'
+// LINK_VERSION_DIGITS-NOT: invalid version number in '-mlinker-version=133.3.0'
+// LINK_VERSION_DIGITS-NOT: invalid version number in '-mlinker-version=133.3.0.1'
+// LINK_VERSION_DIGITS-NOT: invalid version number in '-mlinker-version=133.3.0.1.2'
+// LINK_VERSION_DIGITS: invalid version number in '-mlinker-version=133.3.0.1.2.6'
+// LINK_VERSION_DIGITS: invalid version number in '-mlinker-version=133.3.0.1.a'
+// LINK_VERSION_DIGITS: invalid version number in '-mlinker-version=133.3.0.1a'
Index: lib/Driver/Tools.cpp
===
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -7221,12 +7221,9 @@
   const Driver  = getToolChain().getDriver();
   const toolchains::MachO  = getMachOToolChain();
 
-  unsigned Version[3] = {0, 0, 0};
+  unsigned Version[5] = {0, 0, 0, 0, 0};
   if (Arg *A = Args.getLastArg(options::OPT_mlinker_version_EQ)) {
-bool HadExtra;
-if (!Driver::GetReleaseVersion(A->getValue(), Version[0], Version[1],
-   Version[2], HadExtra) ||
-HadExtra)
+if (!Driver::GetReleaseVersion(A->getValue(), Version))
   D.Diag(diag::err_drv_invalid_version_number) << A->getAsString(Args);
   }
 
Index: lib/Driver/Driver.cpp
===
--- lib/Driver/Driver.cpp
+++ lib/Driver/Driver.cpp
@@ -2533,6 +2533,35 @@
   return true;
 }
 
+/// Parse digits from a string \p Str and fulfill \p Digits with
+/// the parsed numbers. This method assumes that the max number of
+/// digits to look for is equal to Digits.size().
+///
+/// \return True if the entire string was parsed and there are
+/// no extra characters remaining at the end.
+bool Driver::GetReleaseVersion(const char *Str,
+   MutableArrayRef Digits) {
+  if (*Str == '\0')
+return false;
+
+  char *End;
+  unsigned CurDigit = 0;
+  unsigned MaxDigits = Digits.size();
+  while (CurDigit < MaxDigits) {
+unsigned Digit = (unsigned)strtol(Str, , 10);
+Digits[CurDigit] = Digit;
+if (*Str != '\0' && *End == '\0')
+  return true;
+if (*End != '.' || Str == End)
+  return false;
+Str = End + 1;
+CurDigit++;
+  }
+
+  // More digits than requested, bail out...
+  return false;
+}
+
 std::pair Driver::getIncludeExcludeOptionFlagMasks() const {
   unsigned IncludedFlagsBitmask = 0;
   unsigned ExcludedFlagsBitmask = options::NoDriverOption;
Index: include/clang/Driver/Driver.h
===
--- include/clang/Driver/Driver.h
+++ include/clang/Driver/Driver.h
@@ -475,6 +475,15 @@
   static bool GetReleaseVersion(const char *Str, unsigned ,
 unsigned , unsigned ,
 bool );
+
+  /// Parse digits from a string \p Str and fulfill \p Digits with
+  /// the parsed numbers. This method assumes that the max number of
+  /// digits to look for is equal to Digits.size().
+  ///
+  /// \return True if the entire string was parsed and there are
+  /// no extra characters remaining at the end.
+  static bool GetReleaseVersion(const char *Str,
+MutableArrayRef Digits);
 };
 
 ///

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-28 Thread Reid Kleckner via cfe-commits 
rnk added a subscriber: rnk.


Comment at: lib/Driver/Driver.cpp:2541
@@ +2540,3 @@
+/// no extra characters remaining at the end.
+bool Driver::GetReleaseVersion(const char *Str, unsigned MaxDigits,
+   MutableArrayRef Digits) {

You don't need a MaxDigits parameter, it's the same as Digits.size().


http://reviews.llvm.org/D18304



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-28 Thread Bruno Cardoso Lopes via cfe-commits 
bruno added a comment.

Ping :-)


http://reviews.llvm.org/D18304



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Re: [PATCH] D18304: [DarwinDriver] Increase the number of valid digits for ld version string

2016-03-24 Thread Bruno Cardoso Lopes via cfe-commits 
bruno added a comment.

Ping!


http://reviews.llvm.org/D18304



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits