subject:"\[Lldb\-commits\] \[PATCH\] D68647\: Simplify LZMA decoding by using ArrayRef\:\:take

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

2019-10-08 Thread Konrad Wilhelm Kleine via Phabricator via lldb-commits

This revision was automatically updated to reflect the committed changes.
kwk marked an inline comment as done.
Closed by commit rG8970d88b65f0: Simplify LZMA decoding by using 
ArrayRef::take_back (authored by kwk).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68647/new/

https://reviews.llvm.org/D68647

Files:
  lldb/source/Host/common/LZMA.cpp


Index: lldb/source/Host/common/LZMA.cpp
===
--- lldb/source/Host/common/LZMA.cpp
+++ lldb/source/Host/common/LZMA.cpp
@@ -76,7 +76,7 @@
 
   // Decode xz footer.
   lzma_ret xzerr = lzma_stream_footer_decode(
-  , InputBuffer.data() + InputBuffer.size() - 
LZMA_STREAM_HEADER_SIZE);
+  , InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE).data());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_stream_footer_decode()=%s",
@@ -94,11 +94,11 @@
   lzma_index *xzindex;
   uint64_t memlimit(UINT64_MAX);
   size_t inpos = 0;
-  xzerr =
-  lzma_index_buffer_decode(, , nullptr,
-   InputBuffer.data() + InputBuffer.size() -
-   LZMA_STREAM_HEADER_SIZE - 
opts.backward_size,
-   , InputBuffer.size());
+  xzerr = lzma_index_buffer_decode(
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE + opts.backward_size)
+  .data(),
+  , InputBuffer.size());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_index_buffer_decode()=%s",


Index: lldb/source/Host/common/LZMA.cpp
===
--- lldb/source/Host/common/LZMA.cpp
+++ lldb/source/Host/common/LZMA.cpp
@@ -76,7 +76,7 @@
 
   // Decode xz footer.
   lzma_ret xzerr = lzma_stream_footer_decode(
-  , InputBuffer.data() + InputBuffer.size() - LZMA_STREAM_HEADER_SIZE);
+  , InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE).data());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_stream_footer_decode()=%s",
@@ -94,11 +94,11 @@
   lzma_index *xzindex;
   uint64_t memlimit(UINT64_MAX);
   size_t inpos = 0;
-  xzerr =
-  lzma_index_buffer_decode(, , nullptr,
-   InputBuffer.data() + InputBuffer.size() -
-   LZMA_STREAM_HEADER_SIZE - opts.backward_size,
-   , InputBuffer.size());
+  xzerr = lzma_index_buffer_decode(
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE + opts.backward_size)
+  .data(),
+  , InputBuffer.size());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_index_buffer_decode()=%s",
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

2019-10-08 Thread Pavel Labath via Phabricator via lldb-commits

labath accepted this revision.
labath added a comment.
This revision is now accepted and ready to land.

LGTM. I don't know if there's a reasonable way to add a test with a non-zero 
backward_size, but if you can think of something, please add one.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68647/new/

https://reviews.llvm.org/D68647



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

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

2019-10-08 Thread Konrad Wilhelm Kleine via Phabricator via lldb-commits

kwk marked an inline comment as done.
kwk added inline comments.



Comment at: lldb/source/Host/common/LZMA.cpp:99
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE - opts.backward_size)
+  .data(),

labath wrote:
> I think this should be + to preserve semantics, though I am not sure why no 
> tests fail because of that. I guess none of the lzma streams we have have 
> non-zero `backward_size`..
Sorry, tests are still running... and you're right.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68647/new/

https://reviews.llvm.org/D68647



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

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

2019-10-08 Thread Konrad Wilhelm Kleine via Phabricator via lldb-commits

kwk updated this revision to Diff 223865.
kwk marked an inline comment as done.
kwk added a comment.

Fixup


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68647/new/

https://reviews.llvm.org/D68647

Files:
  lldb/source/Host/common/LZMA.cpp


Index: lldb/source/Host/common/LZMA.cpp
===
--- lldb/source/Host/common/LZMA.cpp
+++ lldb/source/Host/common/LZMA.cpp
@@ -76,7 +76,7 @@
 
   // Decode xz footer.
   lzma_ret xzerr = lzma_stream_footer_decode(
-  , InputBuffer.data() + InputBuffer.size() - 
LZMA_STREAM_HEADER_SIZE);
+  , InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE).data());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_stream_footer_decode()=%s",
@@ -94,11 +94,11 @@
   lzma_index *xzindex;
   uint64_t memlimit(UINT64_MAX);
   size_t inpos = 0;
-  xzerr =
-  lzma_index_buffer_decode(, , nullptr,
-   InputBuffer.data() + InputBuffer.size() -
-   LZMA_STREAM_HEADER_SIZE - 
opts.backward_size,
-   , InputBuffer.size());
+  xzerr = lzma_index_buffer_decode(
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE + opts.backward_size)
+  .data(),
+  , InputBuffer.size());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_index_buffer_decode()=%s",


Index: lldb/source/Host/common/LZMA.cpp
===
--- lldb/source/Host/common/LZMA.cpp
+++ lldb/source/Host/common/LZMA.cpp
@@ -76,7 +76,7 @@
 
   // Decode xz footer.
   lzma_ret xzerr = lzma_stream_footer_decode(
-  , InputBuffer.data() + InputBuffer.size() - LZMA_STREAM_HEADER_SIZE);
+  , InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE).data());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_stream_footer_decode()=%s",
@@ -94,11 +94,11 @@
   lzma_index *xzindex;
   uint64_t memlimit(UINT64_MAX);
   size_t inpos = 0;
-  xzerr =
-  lzma_index_buffer_decode(, , nullptr,
-   InputBuffer.data() + InputBuffer.size() -
-   LZMA_STREAM_HEADER_SIZE - opts.backward_size,
-   , InputBuffer.size());
+  xzerr = lzma_index_buffer_decode(
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE + opts.backward_size)
+  .data(),
+  , InputBuffer.size());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_index_buffer_decode()=%s",
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

2019-10-08 Thread Pavel Labath via Phabricator via lldb-commits

labath added inline comments.



Comment at: lldb/source/Host/common/LZMA.cpp:99
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE - opts.backward_size)
+  .data(),

I think this should be + to preserve semantics, though I am not sure why no 
tests fail because of that. I guess none of the lzma streams we have have 
non-zero `backward_size`..


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68647/new/

https://reviews.llvm.org/D68647



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

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

2019-10-08 Thread Konrad Wilhelm Kleine via Phabricator via lldb-commits

kwk created this revision.
kwk added a reviewer: labath.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.

Follow-up for D66791#inline-616303 



Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D68647

Files:
  lldb/source/Host/common/LZMA.cpp


Index: lldb/source/Host/common/LZMA.cpp
===
--- lldb/source/Host/common/LZMA.cpp
+++ lldb/source/Host/common/LZMA.cpp
@@ -76,7 +76,7 @@
 
   // Decode xz footer.
   lzma_ret xzerr = lzma_stream_footer_decode(
-  , InputBuffer.data() + InputBuffer.size() - 
LZMA_STREAM_HEADER_SIZE);
+  , InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE).data());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_stream_footer_decode()=%s",
@@ -94,11 +94,11 @@
   lzma_index *xzindex;
   uint64_t memlimit(UINT64_MAX);
   size_t inpos = 0;
-  xzerr =
-  lzma_index_buffer_decode(, , nullptr,
-   InputBuffer.data() + InputBuffer.size() -
-   LZMA_STREAM_HEADER_SIZE - 
opts.backward_size,
-   , InputBuffer.size());
+  xzerr = lzma_index_buffer_decode(
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE - opts.backward_size)
+  .data(),
+  , InputBuffer.size());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_index_buffer_decode()=%s",


Index: lldb/source/Host/common/LZMA.cpp
===
--- lldb/source/Host/common/LZMA.cpp
+++ lldb/source/Host/common/LZMA.cpp
@@ -76,7 +76,7 @@
 
   // Decode xz footer.
   lzma_ret xzerr = lzma_stream_footer_decode(
-  , InputBuffer.data() + InputBuffer.size() - LZMA_STREAM_HEADER_SIZE);
+  , InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE).data());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_stream_footer_decode()=%s",
@@ -94,11 +94,11 @@
   lzma_index *xzindex;
   uint64_t memlimit(UINT64_MAX);
   size_t inpos = 0;
-  xzerr =
-  lzma_index_buffer_decode(, , nullptr,
-   InputBuffer.data() + InputBuffer.size() -
-   LZMA_STREAM_HEADER_SIZE - opts.backward_size,
-   , InputBuffer.size());
+  xzerr = lzma_index_buffer_decode(
+  , , nullptr,
+  InputBuffer.take_back(LZMA_STREAM_HEADER_SIZE - opts.backward_size)
+  .data(),
+  , InputBuffer.size());
   if (xzerr != LZMA_OK) {
 return llvm::createStringError(llvm::inconvertibleErrorCode(),
"lzma_index_buffer_decode()=%s",
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

[Lldb-commits] [PATCH] D68647: Simplify LZMA decoding by using ArrayRef::take_back

6 matches

Site Navigation

Mail list logo

Footer information