From c76b0534495ae6868afcaf3ca13a7eaf327c46d7 Mon Sep 17 00:00:00 2001 From: Chris Mumford Date: Mon, 13 May 2019 09:30:17 -0700 Subject: [PATCH] Sync TODO and comment processing with external repo. Copybara transforms code slightly different than MOE. One example is the TODO username stripping where Copybara produces different results than MOE did. This change moves the Copybara versions of comments to the public repository. Note: These changes didn't originate in cl/247950252. PiperOrigin-RevId: 247950252 --- snappy-stubs-internal.h | 2 +- snappy-stubs-public.h.in | 1 - snappy.cc | 17 +++++++++-------- snappy_unittest.cc | 2 -- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/snappy-stubs-internal.h b/snappy-stubs-internal.h index c70a84a..9a6a6d1 100644 --- a/snappy-stubs-internal.h +++ b/snappy-stubs-internal.h @@ -199,7 +199,7 @@ struct Unaligned32Struct { ((reinterpret_cast< ::snappy::base::internal::Unaligned32Struct *>(_p))->value = \ (_val)) -// TODO(user): NEON supports unaligned 64-bit loads and stores. +// TODO: NEON supports unaligned 64-bit loads and stores. // See if that would be more efficient on platforms supporting it, // at least for copies. diff --git a/snappy-stubs-public.h.in b/snappy-stubs-public.h.in index b8fe230..2fd82ad 100644 --- a/snappy-stubs-public.h.in +++ b/snappy-stubs-public.h.in @@ -1,5 +1,4 @@ // Copyright 2011 Google Inc. All Rights Reserved. -// Author: sesse@google.com (Steinar H. Gunderson) // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are diff --git a/snappy.cc b/snappy.cc index b78cd12..b36f69d 100644 --- a/snappy.cc +++ b/snappy.cc @@ -74,7 +74,6 @@ #include #include - namespace snappy { using internal::COPY_1_BYTE_OFFSET; @@ -149,8 +148,9 @@ void UnalignedCopy128(const void* src, void* dst) { // Note that this does not match the semantics of either memcpy() or memmove(). inline char* IncrementalCopySlow(const char* src, char* op, char* const op_limit) { - // TODO: Remove pragma when LLVM is aware this function is only called in - // cold regions and when cold regions don't get vectorized or unrolled. + // TODO: Remove pragma when LLVM is aware this + // function is only called in cold regions and when cold regions don't get + // vectorized or unrolled. #ifdef __clang__ #pragma clang loop unroll(disable) #endif @@ -241,6 +241,7 @@ inline char* IncrementalCopy(const char* src, char* op, char* const op_limit, const __m128i pattern = _mm_shuffle_epi8( _mm_loadl_epi64(reinterpret_cast(src)), shuffle_mask); // Uninitialized bytes are masked out by the shuffle mask. + // TODO: remove annotation and macro defs once MSan is fixed. SNAPPY_ANNOTATE_MEMORY_IS_INITIALIZED(&pattern, sizeof(pattern)); pattern_size *= 16 / pattern_size; char* op_end = std::min(op_limit, buf_limit - 15); @@ -287,8 +288,8 @@ inline char* IncrementalCopy(const char* src, char* op, char* const op_limit, // maximize micro-op fusion where possible on modern Intel processors. The // generated code should be checked carefully for new processors or with // major changes to the compiler. - // TODO: Simplify this code when the compiler reliably produces the correct - // x86 instruction sequence. + // TODO: Simplify this code when the compiler reliably produces + // the correct x86 instruction sequence. ptrdiff_t op_to_src = src - op; // The trip count of this loop is not large and so unrolling will only hurt @@ -310,8 +311,8 @@ inline char* IncrementalCopy(const char* src, char* op, char* const op_limit, // buffer. This code path is relatively cold however so we save code size by // avoiding unrolling and vectorizing. // - // TODO: Remove pragma when when cold regions don't get vectorized or - // unrolled. + // TODO: Remove pragma when when cold regions don't get vectorized + // or unrolled. #ifdef __clang__ #pragma clang loop unroll(disable) #endif @@ -856,7 +857,7 @@ class SnappyDecompressor { if (writer->TryFastAppend(ip, ip_limit_ - ip, literal_length)) { assert(literal_length < 61); ip += literal_length; - // NOTE(user): There is no MAYBE_REFILL() here, as TryFastAppend() + // NOTE: There is no MAYBE_REFILL() here, as TryFastAppend() // will not return true unless there's already at least five spare // bytes in addition to the literal. continue; diff --git a/snappy_unittest.cc b/snappy_unittest.cc index 934406f..0221644 100644 --- a/snappy_unittest.cc +++ b/snappy_unittest.cc @@ -29,7 +29,6 @@ #include #include - #include #include #include @@ -523,7 +522,6 @@ static int Verify(const string& input) { return result; } - static bool IsValidCompressedBuffer(const string& c) { return snappy::IsValidCompressedBuffer(c.data(), c.size()); }